From f2029beb7726af4f8d00ba7625be27b49b4db66f Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Sun, 6 May 2012 17:20:11 +0200 Subject: [PATCH] s/dedicatedSlice/cleanProc/g --- examples/Multicast/multicast_experiment.py | 2 +- examples/POPI/popi-tun-classfilter-2MB-q500-pl-hibw.xml | 2 +- examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml | 2 +- examples/ccnx/planetlab_ccndx_inria_test.py | 2 +- examples/planetlab_simple_experiment.py | 2 +- examples/tunnel_cross_testbed_experiment.py | 2 +- test/testbeds/planetlab/execute.py | 2 +- test/testbeds/planetlab/integration.py | 2 +- test/testbeds/planetlab/integration_cross.py | 4 ++-- test/testbeds/planetlab/integration_multi.py | 4 ++-- test/testbeds/planetlab/integration_ns3.py | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/Multicast/multicast_experiment.py b/examples/Multicast/multicast_experiment.py index b54157ae..0f932597 100755 --- 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 976fb551..6ee1bc7a 100644 --- 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 @@ - + diff --git a/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml b/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml index c73848d6..ddf70bc6 100644 --- a/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml +++ b/examples/POPI/popi-tun-classfilter-2MB-q500-pl.xml @@ -7,7 +7,7 @@ - + diff --git a/examples/ccnx/planetlab_ccndx_inria_test.py b/examples/ccnx/planetlab_ccndx_inria_test.py index 240503a0..25bffa12 100644 --- 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 75a6d96e..a1be1970 100644 --- 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 9468f1bf..774bd12e 100644 --- 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 90be38ac..557425f2 100755 --- 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 fe216250..71d9e2b6 100755 --- 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 9f15a43e..30143d0b 100755 --- 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 61a8902f..e8ed2daa 100755 --- 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 7822e9d1..a7377324 100755 --- 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 -- 2.43.0