ec = ExperimentController(exp_id = "test-tap-gre-tunnel")
- node1 = ec.register_resource("PlanetlabNode")
+ node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
- tap1 = ec.register_resource("PlanetlabTap")
+ tap1 = ec.register_resource("planetlab::Tap")
ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock)
ec.set(tap1, "endpoint_prefix", 24)
ec.register_connection(tap1, node1)
- node2 = ec.register_resource("PlanetlabNode")
+ node2 = ec.register_resource("planetlab::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
- tap2 = ec.register_resource("PlanetlabTap")
+ tap2 = ec.register_resource("planetlab::Tap")
ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock)
ec.set(tap2, "endpoint_prefix", 24)
ec.register_connection(tap2, node2)
- gretun = ec.register_resource("LinuxGRETunnel")
+ gretun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tap1, gretun)
ec.register_connection(tap2, gretun)
- app = ec.register_resource("LinuxApplication")
+ app = ec.register_resource("linux::Application")
cmd = "ping -c3 %s.2" % self.netblock
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec = ExperimentController(exp_id = "test-tun-gre-tunnel")
- node1 = ec.register_resource("PlanetlabNode")
+ node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
- tun1 = ec.register_resource("PlanetlabTun")
+ tun1 = ec.register_resource("planetlab::Tun")
ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
ec.set(tun1, "endpoint_prefix", 24)
ec.register_connection(tun1, node1)
- node2 = ec.register_resource("PlanetlabNode")
+ node2 = ec.register_resource("planetlab::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
- tun2 = ec.register_resource("PlanetlabTun")
+ tun2 = ec.register_resource("planetlab::Tun")
ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
ec.set(tun2, "endpoint_prefix", 24)
ec.register_connection(tun2, node2)
- udptun = ec.register_resource("LinuxGRETunnel")
+ udptun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tun1, udptun)
ec.register_connection(tun2, udptun)
- app = ec.register_resource("LinuxApplication")
+ app = ec.register_resource("linux::Application")
cmd = "ping -c3 %s.2" % self.netblock
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec = ExperimentController(exp_id = "test-tap-hybrid-gre-tunnel")
- node1 = ec.register_resource("PlanetlabNode")
+ node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
- tun1 = ec.register_resource("PlanetlabTun")
+ tun1 = ec.register_resource("planetlab::Tun")
ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
ec.set(tun1, "endpoint_prefix", 24)
ec.register_connection(tun1, node1)
- node2 = ec.register_resource("LinuxNode")
+ node2 = ec.register_resource("linux::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
- tun2 = ec.register_resource("LinuxTun")
+ tun2 = ec.register_resource("linux::Tun")
ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
ec.set(tun2, "endpoint_prefix", 24)
ec.register_connection(tun2, node2)
- gretun = ec.register_resource("LinuxGRETunnel")
+ gretun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tun1, gretun)
ec.register_connection(tun2, gretun)
- app = ec.register_resource("LinuxApplication")
+ app = ec.register_resource("linux::Application")
# It seems the hybrid tunnel takes some time to setup... we add a sleep 5
# XXX: Debug this to see if it can be fixed on the RMs
cmd = "sleep 5; ping -c3 %s.2" % self.netblock