s/dedicatedSlice/cleanProc/g

diff --git a/examples/Multicast/multicast_experiment.py b/examples/Multicast/multicast_experiment.py
index b54157a..0f93259 100755 (executable)
--- a/examples/Multicast/multicast_experiment.py
+++ b/examples/Multicast/multicast_experiment.py
@@ -91,7 +91,7 @@ class PlanetLabMulticastOverlay:
         pl_desc.set_attribute_value("plcHost", plchost)
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", not self.no_p2p_deploy)
-        pl_desc.set_attribute_value("dedicatedSlice", True)
+        pl_desc.set_attribute_value("cleanProc", True)
         pl_desc.set_attribute_value("plLogLevel", "INFO")
         
         return pl_desc, exp_desc

diff --git a/examples/POPI/popi-tun-classfilter-2MB-q500-pl-hibw.xml b/examples/POPI/popi-tun-classfilter-2MB-q500-pl-hibw.xml
index 976fb55..6ee1bc7 100644 (file)
--- a/examples/POPI/popi-tun-classfilter-2MB-q500-pl-hibw.xml
+++ b/examples/POPI/popi-tun-classfilter-2MB-q500-pl-hibw.xml
@@ -7,7 +7,7 @@
                 <attribute name="slice" type="STRING" value="##plslice##"/>
                 <attribute name="plLogLevel" type="STRING" value="INFO"/>
                 <attribute name="logLevel" type="STRING" value="Debug"/>
-                <attribute name="dedicatedSlice" type="BOOL" value="True"/>
+                <attribute name="cleanProc" type="BOOL" value="True"/>
                 <attribute name="plcUrl" type="STRING" value="https://%(hostname)s:443/PLCAPI/"/>
                 <attribute name="recoveryPolicy" type="STRING" value="Recover"/>
                 <attribute name="p2pDeployment" type="BOOL" value="False"/>

diff --git a/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml b/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml
index c73848d..ddf70bc 100644 (file)
--- a/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml
+++ b/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml
@@ -7,7 +7,7 @@
                 <attribute name="slice" type="STRING" value="##plslice##"/>
                 <attribute name="plLogLevel" type="STRING" value="INFO"/>
                 <attribute name="logLevel" type="STRING" value="Debug"/>
-                <attribute name="dedicatedSlice" type="BOOL" value="True"/>
+                <attribute name="cleanProc" type="BOOL" value="True"/>
                 <attribute name="plcUrl" type="STRING" value="https://%(hostname)s:443/PLCAPI/"/>
                 <attribute name="recoveryPolicy" type="STRING" value="Recover"/>
                 <attribute name="p2pDeployment" type="BOOL" value="False"/>

diff --git a/examples/ccnx/planetlab_ccndx_inria_test.py b/examples/ccnx/planetlab_ccndx_inria_test.py
index 240503a..25bffa1 100644 (file)
--- a/examples/ccnx/planetlab_ccndx_inria_test.py
+++ b/examples/ccnx/planetlab_ccndx_inria_test.py
@@ -34,7 +34,7 @@ def create_slice_desc(slicename, plc_host, pl_user, pl_pwd, pl_ssh_key,
     slice_desc.set_attribute_value("plcHost", plc_host)
     slice_desc.set_attribute_value("tapPortBase", port_base)
     # Kills all running processes before starting the experiment
-    slice_desc.set_attribute_value("dedicatedSlice", True)
+    slice_desc.set_attribute_value("cleanProc", True)
     slice_desc.set_attribute_value("plLogLevel", "DEBUG")
     return slice_desc
  

diff --git a/examples/planetlab_simple_experiment.py b/examples/planetlab_simple_experiment.py
index 75a6d96..a1be197 100644 (file)
--- a/examples/planetlab_simple_experiment.py
+++ b/examples/planetlab_simple_experiment.py
@@ -34,7 +34,7 @@ pl_desc.set_attribute_value("authPass", pl_pwd)
 pl_desc.set_attribute_value("plcHost", plchost)
 pl_desc.set_attribute_value("tapPortBase", port_base)
 pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-pl_desc.set_attribute_value("dedicatedSlice", True)
+pl_desc.set_attribute_value("cleanProc", True)
 pl_desc.set_attribute_value("plLogLevel", "DEBUG")
        
 pl_inet = pl_desc.create("Internet")

diff --git a/examples/tunnel_cross_testbed_experiment.py b/examples/tunnel_cross_testbed_experiment.py
index 9468f1b..774bd12 100644 (file)
--- a/examples/tunnel_cross_testbed_experiment.py
+++ b/examples/tunnel_cross_testbed_experiment.py
@@ -36,7 +36,7 @@ pl_desc.set_attribute_value("authPass", pl_pwd)
 pl_desc.set_attribute_value("plcHost", plchost)
 pl_desc.set_attribute_value("tapPortBase", port_base)
 pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-pl_desc.set_attribute_value("dedicatedSlice", True)
+pl_desc.set_attribute_value("cleanProc", True)
 pl_desc.set_attribute_value("plLogLevel", "DEBUG")
        
 pl_inet = pl_desc.create("Internet")

diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py
index 90be38a..557425f 100755 (executable)
--- a/test/testbeds/planetlab/execute.py
+++ b/test/testbeds/planetlab/execute.py
@@ -74,7 +74,7 @@ class PlanetLabExecuteTestCase(unittest.TestCase):
         instance.defer_configure("plcHost", plchost)
         instance.defer_configure("tapPortBase", self.port_base)
         instance.defer_configure("p2pDeployment", False) # it's interactive, we don't want it in tests
-        instance.defer_configure("dedicatedSlice", True)
+        instance.defer_configure("cleanProc", True)
         
         # Hack, but we need vsys_vnet
         instance.do_setup()

diff --git a/test/testbeds/planetlab/integration.py b/test/testbeds/planetlab/integration.py
index fe21625..71d9e2b 100755 (executable)
--- a/test/testbeds/planetlab/integration.py
+++ b/test/testbeds/planetlab/integration.py
@@ -61,7 +61,7 @@ class PlanetLabIntegrationTestCase(unittest.TestCase):
         pl_desc.set_attribute_value("plcHost", plchost)
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc.set_attribute_value("dedicatedSlice", True)
+        pl_desc.set_attribute_value("cleanProc", True)
         pl_desc.set_attribute_value("plLogLevel", "DEBUG")
         if use_sfa:
             pl_desc.set_attribute_value("sfa", True)

diff --git a/test/testbeds/planetlab/integration_cross.py b/test/testbeds/planetlab/integration_cross.py
index 9f15a43..30143d0 100755 (executable)
--- a/test/testbeds/planetlab/integration_cross.py
+++ b/test/testbeds/planetlab/integration_cross.py
@@ -68,7 +68,7 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         pl_desc.set_attribute_value("plcHost", plchost1)
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc.set_attribute_value("dedicatedSlice", True)
+        pl_desc.set_attribute_value("cleanProc", True)
 
         pl_desc2 = exp_desc.add_testbed_description(pl_provider)
         pl_desc2.set_attribute_value("homeDirectory", self.root_dir+"v2")
@@ -79,7 +79,7 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         pl_desc2.set_attribute_value("plcHost", plchost2)
         pl_desc2.set_attribute_value("tapPortBase", self.port_base+500)
         pl_desc2.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc2.set_attribute_value("dedicatedSlice", True)
+        pl_desc2.set_attribute_value("cleanProc", True)
         
         return pl_desc, pl_desc2, exp_desc
     

diff --git a/test/testbeds/planetlab/integration_multi.py b/test/testbeds/planetlab/integration_multi.py
index 61a8902..e8ed2da 100755 (executable)
--- a/test/testbeds/planetlab/integration_multi.py
+++ b/test/testbeds/planetlab/integration_multi.py
@@ -70,7 +70,7 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         pl_desc.set_attribute_value("plcHost", plchost1)
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc.set_attribute_value("dedicatedSlice", True)
+        pl_desc.set_attribute_value("cleanProc", True)
         pl_desc.set_attribute_value("plLogLevel", "DEBUG")
 
         pl_desc2 = exp_desc.add_testbed_description(pl_provider)
@@ -82,7 +82,7 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         pl_desc2.set_attribute_value("plcHost", plchost2)
         pl_desc2.set_attribute_value("tapPortBase", self.port_base+500)
         pl_desc2.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc2.set_attribute_value("dedicatedSlice", True)
+        pl_desc2.set_attribute_value("cleanProc", True)
         pl_desc2.set_attribute_value("plLogLevel", "DEBUG")
         
         return pl_desc, pl_desc2, exp_desc

diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py
index 7822e9d..a737732 100755 (executable)
--- a/test/testbeds/planetlab/integration_ns3.py
+++ b/test/testbeds/planetlab/integration_ns3.py
@@ -58,7 +58,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
         pl_desc.set_attribute_value("plcHost", plchost)
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
-        pl_desc.set_attribute_value("dedicatedSlice", True)
+        pl_desc.set_attribute_value("cleanProc", True)
         #pl_desc.set_attribute_value("plLogLevel", "DEBUG")
         
         return pl_desc, exp_desc