X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fovs.py;h=b0f06d5454c8371811bcbe33b4734d98614c7cb1;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=0cb6c20b7a33e58864aa82afe79d5e530ed67904;hpb=98404dbb5666f17408ed6166d47bba12110a12f1;p=nepi.git diff --git a/test/resources/planetlab/ovs.py b/test/resources/planetlab/ovs.py old mode 100644 new mode 100755 index 0cb6c20b..b0f06d54 --- a/test/resources/planetlab/ovs.py +++ b/test/resources/planetlab/ovs.py @@ -4,9 +4,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -37,99 +36,104 @@ class OvsTestCase(unittest.TestCase): def setUp(self): self.switch1 = "planetlab2.virtues.fi" self.switch2 = "planetlab2.upc.es" - self.host1 = "planetlab2.ionio.gr" - self.host2 = "planetlab2.cs.aueb.gr" + self.host1 = "onelab4.warsaw.rd.tp.pl" + self.host2 = "inriarennes1.irisa.fr" self.user = "inria_nepi" @skipIfAnyNotAlive def t_ovs(self, user1, switch1, user2, switch2, user3, host1, user4, host2): + network = "192.168.3.0" ec = ExperimentController(exp_id = "test-ovs") - node1 = ec.register_resource("PlanetlabNode") + node1 = ec.register_resource("planetlab::Node") ec.set(node1, "hostname", switch1) ec.set(node1, "username", user1) - ec.set(node1, "cleanHome", True) + ec.set(node1, "cleanExperiment", True) ec.set(node1, "cleanProcesses", True) - ovs1 = ec.register_resource("OVSWitch") + ovs1 = ec.register_resource("planetlab::OVSSwitch") ec.set(ovs1, "bridge_name", "nepi_bridge") ec.set(ovs1, "virtual_ip_pref", "192.168.3.1/24") ec.set(ovs1, "controller_ip", "85.23.168.77") ec.set(ovs1, "controller_port", "6633") ec.register_connection(ovs1, node1) - port1 = ec.register_resource("OVSPort") + port1 = ec.register_resource("planetlab::OVSPort") ec.set(port1, "port_name", "port-1") + ec.set(port1, "network", network) ec.register_connection(port1, ovs1) - port2 = ec.register_resource("OVSPort") + port2 = ec.register_resource("planetlab::OVSPort") ec.set(port2, "port_name", "port-2") + ec.set(port2, "network", network) ec.register_connection(port2, ovs1) - node2 = ec.register_resource("PlanetlabNode") + node2 = ec.register_resource("planetlab::Node") ec.set(node2, "hostname", switch2) ec.set(node2, "username", user2) - ec.set(node2, "cleanHome", True) + ec.set(node2, "cleanExperiment", True) ec.set(node2, "cleanProcesses", True) - ovs2 = ec.register_resource("OVSWitch") + ovs2 = ec.register_resource("planetlab::OVSSwitch") ec.set(ovs2, "bridge_name", "nepi_bridge") ec.set(ovs2, "virtual_ip_pref", "192.168.3.2/24") ec.set(ovs2, "controller_ip", "85.23.168.77") ec.set(ovs2, "controller_port", "6633") ec.register_connection(ovs2, node2) - port3 = ec.register_resource("OVSPort") + port3 = ec.register_resource("planetlab::OVSPort") ec.set(port3, "port_name", "port-3") + ec.set(port3, "network", network) ec.register_connection(port3, ovs2) - port4 = ec.register_resource("OVSPort") + port4 = ec.register_resource("planetlab::OVSPort") ec.set(port4, "port_name", "port-4") + ec.set(port4, "network", network) ec.register_connection(port4, ovs2) - node3 = ec.register_resource("PlanetlabNode") + node3 = ec.register_resource("planetlab::Node") ec.set(node3, "hostname", host1) ec.set(node3, "username", user3) - ec.set(node3, "cleanHome", True) + ec.set(node3, "cleanExperiment", True) ec.set(node3, "cleanProcesses", True) - tap1 = ec.register_resource("PlanetlabTap") - ec.set(tap1, "ip4", "192.168.3.3") + tap1 = ec.register_resource("planetlab::Tap") + ec.set(tap1, "ip", "192.168.3.3") ec.set(tap1, "pointopoint", "192.168.3.1") - ec.set(tap1, "prefix4", 24) + ec.set(tap1, "prefix", "24") ec.register_connection(tap1, node3) - node4 = ec.register_resource("PlanetlabNode") + node4 = ec.register_resource("planetlab::Node") ec.set(node4, "hostname", host2) ec.set(node4, "username", user4) - ec.set(node4, "cleanHome", True) + ec.set(node4, "cleanExperiment", True) ec.set(node4, "cleanProcesses", True) - tap2 = ec.register_resource("PlanetlabTap") - ec.set(tap2, "ip4", "192.168.3.4") + tap2 = ec.register_resource("planetlab::Tap") + ec.set(tap2, "ip", "192.168.3.4") ec.set(tap2, "pointopoint", "192.168.3.2") - ec.set(tap2, "prefix4", 24) + ec.set(tap2, "prefix", "24") ec.register_connection(tap2, node4) - ovstun1 = ec.register_resource("Tunnel") + ovstun1 = ec.register_resource("linux::UdpTunnel") ec.register_connection(port1, ovstun1) ec.register_connection(tap1, ovstun1) - ovstun2 = ec.register_resource("Tunnel") + ovstun2 = ec.register_resource("linux::UdpTunnel") ec.register_connection(port3, ovstun2) ec.register_connection(tap2, ovstun2) - ovstun3 = ec.register_resource("Tunnel") + ovstun3 = ec.register_resource("linux::UdpTunnel") ec.register_connection(port2, ovstun3) ec.register_connection(port4, ovstun3) - app1 = ec.register_resource("LinuxApplication") + app1 = ec.register_resource("linux::Application") cmd = "ping -c3 192.168.3.2" ec.set(app1, "command", cmd) ec.register_connection(app1, node1) - app2 = ec.register_resource("LinuxApplication") + app2 = ec.register_resource("linux::Application") cmd = "ping -c3 192.168.3.4" ec.set(app2, "command", cmd) ec.register_connection(app2, node2)