Changed the endpoint_ip and endpoint_prefix attributes of TAP/TUN endpoints for ip...

[nepi.git] / examples / openvswitch / ovs_ping_3switches_line.py

diff --git a/examples/openvswitch/ovs_ping_3switches_line.py b/examples/openvswitch/ovs_ping_3switches_line.py
index b48485e..d686ef3 100644 (file)
--- a/examples/openvswitch/ovs_ping_3switches_line.py
+++ b/examples/openvswitch/ovs_ping_3switches_line.py
@@ -32,20 +32,20 @@ from nepi.execution.ec import ExperimentController
 import os, time
 
 def add_node(ec, host, user, pl_user, pl_password):
-    node = ec.register_resource("PlanetlabNode")
+    node = ec.register_resource("planetlab::Node")
     ec.set(node, "hostname", host)
     ec.set(node, "username", user)
     if pl_user:
         ec.set(node, "pluser", pl_user)
     if pl_password:
         ec.set(node, "plpassword", pl_password)
-    ec.set(node, "cleanHome", True)
+    ec.set(node, "cleanExperiment", True)
     ec.set(node, "cleanProcesses", True)
 
     return node
 
 def add_ovs(ec, bridge_name, virtual_ip_pref, controller_ip, controller_port, node):
-    ovs = ec.register_resource("OVSSwitch")
+    ovs = ec.register_resource("planetlab::OVSSwitch")
     ec.set(ovs, "bridge_name", bridge_name)
     ec.set(ovs, "virtual_ip_pref", virtual_ip_pref)
     ec.set(ovs, "controller_ip", controller_ip)
@@ -54,29 +54,29 @@ def add_ovs(ec, bridge_name, virtual_ip_pref, controller_ip, controller_port, no
     return ovs
 
 def add_port(ec, port_name, network, ovs):
-    port = ec.register_resource("OVSPort")
+    port = ec.register_resource("planetlab::OVSPort")
     ec.set(port, "port_name", port_name)
     ec.set(port, "network", network)
     ec.register_connection(port, ovs)
     return port
 
-def add_tap(ec, endpoint_ip, endpoint_prefix, pointopoint, node):
-    tap = ec.register_resource("PlanetlabTap")
-    ec.set(tap, "endpoint_ip", endpoint_ip)
-    ec.set(tap, "endpoint_prefix", endpoint_prefix)
+def add_tap(ec, ip, prefix, pointopoint, node):
+    tap = ec.register_resource("planetlab::Tap")
+    ec.set(tap, "ip", ip)
+    ec.set(tap, "prefix", prefix)
     ec.set(tap, "pointopoint", pointopoint)
     ec.set(tap, "up", True)
     ec.register_connection(tap, node)
     return tap
 
 def add_tunnel(ec, port0, tap):
-    tunnel = ec.register_resource("LinuxUdpTunnel")
+    tunnel = ec.register_resource("linux::UdpTunnel")
     ec.register_connection(port0, tunnel)
     ec.register_connection(tunnel, tap)
     return tunnel
 
 def add_app(ec, command, node):
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
     ec.set(app, "command", command)
     ec.register_connection(app, node)
     return app
@@ -126,9 +126,9 @@ h2_node = add_node(ec, host2, slicename, pl_user, pl_password)
 h3_node = add_node(ec, host3, slicename, pl_user, pl_password)
 
 # Add tap devices
-tap1 = add_tap(ec, "192.168.3.1", 24, "192.168.3.2", h1_node)
-tap2 = add_tap(ec, "192.168.3.3", 24, "192.168.3.4", h2_node)
-tap3 = add_tap(ec, "192.168.3.5", 24, "192.168.3.6", h3_node)
+tap1 = add_tap(ec, "192.168.3.1", "24", "192.168.3.2", h1_node)
+tap2 = add_tap(ec, "192.168.3.3", "24", "192.168.3.4", h2_node)
+tap3 = add_tap(ec, "192.168.3.5", "24", "192.168.3.6", h3_node)
 
 # Connect the nodes
 tunnel1 = add_tunnel(ec, port1, tap1)
@@ -208,6 +208,3 @@ f.close()
 ec.shutdown()
 
 
-
-
-