From e17770aa993c796d589231013e8adec27bff327d Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Mon, 30 May 2011 19:09:32 +0200 Subject: [PATCH] ns3 version 3_9_RC3 replaces for 3_9 --- examples/vlc_wireless_netns_ns3.py | 2 +- examples/wimax_ns3.py | 2 +- ...a_v3_9_RC3.py => attributes_metadata_v3_9.py} | 2 +- ...a_v3_9_RC3.py => connection_metadata_v3_9.py} | 0 ...ta_v3_9_RC3.py => factories_metadata_v3_9.py} | 0 .../{metadata_v3_9_RC3.py => metadata_v3_9.py} | 16 ++++++++-------- ...adata_v3_9_RC3.py => traces_metadata_v3_9.py} | 0 test/testbeds/ns3/design.py | 2 +- test/testbeds/ns3/execute.py | 2 +- test/testbeds/ns3/execute2.py | 2 +- test/testbeds/ns3/integration.py | 4 ++-- test/testbeds/planetlab/integration_cross.py | 2 +- test/testbeds/planetlab/integration_ns3.py | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) rename src/nepi/testbeds/ns3/{attributes_metadata_v3_9_RC3.py => attributes_metadata_v3_9.py} (99%) rename src/nepi/testbeds/ns3/{connection_metadata_v3_9_RC3.py => connection_metadata_v3_9.py} (100%) rename src/nepi/testbeds/ns3/{factories_metadata_v3_9_RC3.py => factories_metadata_v3_9.py} (100%) rename src/nepi/testbeds/ns3/{metadata_v3_9_RC3.py => metadata_v3_9.py} (59%) rename src/nepi/testbeds/ns3/{traces_metadata_v3_9_RC3.py => traces_metadata_v3_9.py} (100%) diff --git a/examples/vlc_wireless_netns_ns3.py b/examples/vlc_wireless_netns_ns3.py index 03c91383..066e1c37 100644 --- a/examples/vlc_wireless_netns_ns3.py +++ b/examples/vlc_wireless_netns_ns3.py @@ -119,7 +119,7 @@ class VlcWirelessNetnsNs3Example(object): exp_desc = ExperimentDescription() ## NS3 Testbed instance description ## - testbed_version = "3_9_RC3" + testbed_version = "3_9" testbed_id = "ns3" ns3_provider = FactoriesProvider(testbed_id, testbed_version) ns3_desc = exp_desc.add_testbed_description(ns3_provider) diff --git a/examples/wimax_ns3.py b/examples/wimax_ns3.py index 0daa6029..f8cdece2 100644 --- a/examples/wimax_ns3.py +++ b/examples/wimax_ns3.py @@ -78,7 +78,7 @@ class Roads09Example(object): def run(self): exp_desc = ExperimentDescription() - testbed_version = "3_9_RC3" + testbed_version = "3_9" testbed_id = "ns3" ns3_provider = FactoriesProvider(testbed_id, testbed_version) ns3_desc = exp_desc.add_testbed_description(ns3_provider) diff --git a/src/nepi/testbeds/ns3/attributes_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py similarity index 99% rename from src/nepi/testbeds/ns3/attributes_metadata_v3_9_RC3.py rename to src/nepi/testbeds/ns3/attributes_metadata_v3_9.py index 719fe10c..4aa38808 100644 --- a/src/nepi/testbeds/ns3/attributes_metadata_v3_9_RC3.py +++ b/src/nepi/testbeds/ns3/attributes_metadata_v3_9.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from factories_metadata_v3_9_RC3 import wifi_standards, l4_protocols, \ +from factories_metadata_v3_9 import wifi_standards, l4_protocols, \ service_flow_direction, service_flow_scheduling_type import validation as ns3_validation from nepi.core.attributes import Attribute diff --git a/src/nepi/testbeds/ns3/connection_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/connection_metadata_v3_9.py similarity index 100% rename from src/nepi/testbeds/ns3/connection_metadata_v3_9_RC3.py rename to src/nepi/testbeds/ns3/connection_metadata_v3_9.py diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py similarity index 100% rename from src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py rename to src/nepi/testbeds/ns3/factories_metadata_v3_9.py diff --git a/src/nepi/testbeds/ns3/metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/metadata_v3_9.py similarity index 59% rename from src/nepi/testbeds/ns3/metadata_v3_9_RC3.py rename to src/nepi/testbeds/ns3/metadata_v3_9.py index 1058aae1..3c710390 100644 --- a/src/nepi/testbeds/ns3/metadata_v3_9_RC3.py +++ b/src/nepi/testbeds/ns3/metadata_v3_9.py @@ -6,41 +6,41 @@ from nepi.core import metadata class VersionedMetadataInfo(metadata.VersionedMetadataInfo): @property def connector_types(self): - from connection_metadata_v3_9_RC3 import connector_types + from connection_metadata_v3_9 import connector_types return connector_types @property def connections(self): - from connection_metadata_v3_9_RC3 import connections + from connection_metadata_v3_9 import connections return connections @property def attributes(self): - from attributes_metadata_v3_9_RC3 import attributes + from attributes_metadata_v3_9 import attributes return attributes @property def traces(self): - from traces_metadata_v3_9_RC3 import traces + from traces_metadata_v3_9 import traces return traces @property def create_order(self): - from factories_metadata_v3_9_RC3 import factories_order + from factories_metadata_v3_9 import factories_order return factories_order @property def configure_order(self): - from factories_metadata_v3_9_RC3 import factories_order + from factories_metadata_v3_9 import factories_order return factories_order @property def factories_info(self): - from factories_metadata_v3_9_RC3 import factories_info + from factories_metadata_v3_9 import factories_info return factories_info @property def testbed_attributes(self): - from attributes_metadata_v3_9_RC3 import testbed_attributes + from attributes_metadata_v3_9 import testbed_attributes return testbed_attributes diff --git a/src/nepi/testbeds/ns3/traces_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/traces_metadata_v3_9.py similarity index 100% rename from src/nepi/testbeds/ns3/traces_metadata_v3_9_RC3.py rename to src/nepi/testbeds/ns3/traces_metadata_v3_9.py diff --git a/test/testbeds/ns3/design.py b/test/testbeds/ns3/design.py index cf36c7cd..e5f5e315 100755 --- a/test/testbeds/ns3/design.py +++ b/test/testbeds/ns3/design.py @@ -11,7 +11,7 @@ import uuid class Ns3DesignTestCase(unittest.TestCase): def test_design_if(self): exp_desc = ExperimentDescription() - testbed_version = "3_9_RC3" + testbed_version = "3_9" testbed_id = "ns3" provider = FactoriesProvider(testbed_id, testbed_version) tstbd_desc = exp_desc.add_testbed_description(provider) diff --git a/test/testbeds/ns3/execute.py b/test/testbeds/ns3/execute.py index a8db9aab..be983db5 100755 --- a/test/testbeds/ns3/execute.py +++ b/test/testbeds/ns3/execute.py @@ -17,7 +17,7 @@ class Ns3ExecuteTestCase(unittest.TestCase): @test_util.skipUnless(test_util.ns3_usable(), "Test requires working ns-3 bindings") def test_run_ping_if(self): - testbed_version = "3_9_RC3" + testbed_version = "3_9" instance = ns3.TestbedController(testbed_version) instance.defer_configure("homeDirectory", self.root_dir) instance.defer_create(2, "ns3::Node") diff --git a/test/testbeds/ns3/execute2.py b/test/testbeds/ns3/execute2.py index e04a4876..30720976 100755 --- a/test/testbeds/ns3/execute2.py +++ b/test/testbeds/ns3/execute2.py @@ -23,7 +23,7 @@ class Ns3ExecuteTestCase(unittest.TestCase): @test_util.skipUnless(test_util.ns3_usable(), "Test requires working ns-3 bindings") def test_run_ping_routing(self): - testbed_version = "3_9_RC3" + testbed_version = "3_9" instance = ns3.TestbedController(testbed_version) instance.defer_configure("homeDirectory", self.root_dir) instance.defer_create(2, "ns3::Node") diff --git a/test/testbeds/ns3/integration.py b/test/testbeds/ns3/integration.py index 4bbfc089..d247d211 100755 --- a/test/testbeds/ns3/integration.py +++ b/test/testbeds/ns3/integration.py @@ -21,7 +21,7 @@ class Ns3IntegrationTestCase(unittest.TestCase): "Test requires working ns-3 bindings") def test_local_if(self): exp_desc = ExperimentDescription() - testbed_version = "3_9_RC3" + testbed_version = "3_9" testbed_id = "ns3" ns3_provider = FactoriesProvider(testbed_id, testbed_version) ns3_desc = exp_desc.add_testbed_description(ns3_provider) @@ -83,7 +83,7 @@ class Ns3IntegrationTestCase(unittest.TestCase): "Test requires working ns-3 bindings") def test_all_daemonized_if(self): exp_desc = ExperimentDescription() - testbed_version = "3_9_RC3" + testbed_version = "3_9" testbed_id = "ns3" ns3_provider = FactoriesProvider(testbed_id, testbed_version) ns3_desc = exp_desc.add_testbed_description(ns3_provider) diff --git a/test/testbeds/planetlab/integration_cross.py b/test/testbeds/planetlab/integration_cross.py index 8bba6e71..978745c0 100755 --- a/test/testbeds/planetlab/integration_cross.py +++ b/test/testbeds/planetlab/integration_cross.py @@ -105,7 +105,7 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase): def make_ns_in_pl(self, pl, exp, node1, iface1, root): ns3_testbed_id = "ns3" - ns3_testbed_version = "3_9_RC3" + ns3_testbed_version = "3_9" # Add NS3 support in node1 plnepi = pl.create("NepiDependency") diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py index afc4a5f5..b7e9d7ed 100755 --- a/test/testbeds/planetlab/integration_ns3.py +++ b/test/testbeds/planetlab/integration_ns3.py @@ -99,7 +99,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase): def make_ns_in_pl(self, pl, exp, node1, iface1, root): ns3_testbed_id = "ns3" - ns3_testbed_version = "3_9_RC3" + ns3_testbed_version = "3_9" # Add NS3 support in node1 plnepi = pl.create("NepiDependency") @@ -136,7 +136,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase): "Test is expensive, requires NEPI_FULL_TESTS=yes") def test_ns3_in_pl(self): ns3_testbed_id = "ns3" - ns3_testbed_version = "3_9_RC3" + ns3_testbed_version = "3_9" pl, exp = self.make_experiment_desc() -- 2.43.0