def setUp(self):
#self.host1 = "nepi2.pl.sophia.inria.fr"
#self.host2 = "nepi5.pl.sophia.inria.fr"
+ #self.host2 = "planetlab1.informatik.uni-goettingen.de"
self.host1 = "planetlab1.informatik.uni-erlangen.de"
- self.host2 = "planetlab1.informatik.uni-goettingen.de"
+ self.host2 = "planck227ple.test.ibbt.be"
self.host3 = "roseval.pl.sophia.inria.fr"
self.user = "inria_nepi"
self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- ec.set(node1, "cleanHome", True)
+ #ec.set(node1, "cleanHome", True)
+ ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("PlanetlabTap")
- ec.set(tap1, "ip4", "%s.1" % self.netblock)
- ec.set(tap1, "prefix4", 24)
+ 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")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- ec.set(node2, "cleanHome", True)
+ #ec.set(node2, "cleanHome", True)
+ ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("PlanetlabTap")
- ec.set(tap2, "ip4", "%s.2" % self.netblock)
- ec.set(tap2, "prefix4", 24)
+ 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")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- ec.set(node1, "cleanHome", True)
+ #ec.set(node1, "cleanHome", True)
+ ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
- ec.set(tun1, "ip4", "%s.1" % self.netblock)
- ec.set(tun1, "prefix4", 24)
+ 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")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- ec.set(node2, "cleanHome", True)
+ #ec.set(node2, "cleanHome", True)
+ ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("PlanetlabTun")
- ec.set(tun2, "ip4", "%s.2" % self.netblock)
- ec.set(tun2, "prefix4", 24)
+ 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")
ec.set(node1, "hostname", host1)
ec.set(node1, "username", user1)
ec.set(node1, "identity", identity1)
- ec.set(node1, "cleanHome", True)
+ #ec.set(node1, "cleanHome", True)
+ ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
- ec.set(tun1, "ip4", "%s.1" % self.netblock)
- ec.set(tun1, "prefix4", 24)
+ 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")
ec.set(node2, "hostname", host2)
ec.set(node2, "username", user2)
ec.set(node2, "identity", identity2)
- ec.set(node2, "cleanHome", True)
+ #ec.set(node2, "cleanHome", True)
+ ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("LinuxTun")
- ec.set(tun2, "ip4", "%s.2" % self.netblock)
- ec.set(tun2, "prefix4", 24)
+ 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")
ec.register_connection(tun2, gretun)
app = ec.register_resource("LinuxApplication")
- cmd = "ping -c3 %s.2" % self.netblock
+ # 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
ec.set(app, "command", cmd)
ec.register_connection(app, node1)