def t_tap_gre_tunnel(self, user1, host1, identity1, user2, host2,
identity2):
- ec = ExperimentController(exp_id = "test-tap-gre-tunnel")
+ ec = ExperimentController(exp_id="test-tap-gre-tunnel")
node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- #ec.set(node1, "cleanHome", True)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("planetlab::Tap")
- ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock)
- ec.set(tap1, "endpoint_prefix", 24)
+ ec.set(tap1, "ip", "%s.1" % self.netblock)
+ ec.set(tap1, "prefix", "24")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("planetlab::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- #ec.set(node2, "cleanHome", True)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("planetlab::Tap")
- ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock)
- ec.set(tap2, "endpoint_prefix", 24)
+ ec.set(tap2, "ip", "%s.2" % self.netblock)
+ ec.set(tap2, "prefix", "24")
ec.register_connection(tap2, node2)
gretun = ec.register_resource("linux::GRETunnel")
ec.wait_finished(app)
- ping = ec.trace(app, 'stdout')
+ ping = ec.trace(app, "stdout")
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)
def t_tun_gre_tunnel(self, user1, host1, identity1, user2, host2,
identity2):
- ec = ExperimentController(exp_id = "test-tun-gre-tunnel")
+ ec = ExperimentController(exp_id="test-tun-gre-tunnel")
node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- #ec.set(node1, "cleanHome", True)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("planetlab::Tun")
- ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
- ec.set(tun1, "endpoint_prefix", 24)
+ ec.set(tun1, "ip", "%s.1" % self.netblock)
+ ec.set(tun1, "prefix", "24")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("planetlab::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- #ec.set(node2, "cleanHome", True)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("planetlab::Tun")
- ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
- ec.set(tun2, "endpoint_prefix", 24)
+ ec.set(tun2, "ip", "%s.2" % self.netblock)
+ ec.set(tun2, "prefix", "24")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::GRETunnel")
ec.wait_finished(app)
- ping = ec.trace(app, 'stdout')
+ ping = ec.trace(app, "stdout")
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)
def t_tun_hybrid_gre_tunnel(self, user1, host1, identity1,
user2, host2, identity2):
- ec = ExperimentController(exp_id = "test-tap-hybrid-gre-tunnel")
+ ec = ExperimentController(exp_id="test-tap-hybrid-gre-tunnel")
node1 = ec.register_resource("planetlab::Node")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- #ec.set(node1, "cleanHome", True)
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("planetlab::Tun")
- ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
- ec.set(tun1, "endpoint_prefix", 24)
+ ec.set(tun1, "ip", "%s.1" % self.netblock)
+ ec.set(tun1, "prefix", "24")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- #ec.set(node2, "cleanHome", True)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
- ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
- ec.set(tun2, "endpoint_prefix", 24)
+ ec.set(tun2, "ip", "%s.2" % self.netblock)
+ ec.set(tun2, "prefix", "24")
ec.register_connection(tun2, node2)
gretun = ec.register_resource("linux::GRETunnel")
ec.wait_finished(app)
- ping = ec.trace(app, 'stdout')
+ ping = ec.trace(app, "stdout")
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)