Merge "DRAFT: model: remove vld_id not needed"

diff --git a/tests/unit/benchmark/contexts/test_heat.py b/tests/unit/benchmark/contexts/test_heat.py
index 658a8e5..cc0c7bc 100644 (file)
--- a/tests/unit/benchmark/contexts/test_heat.py
+++ b/tests/unit/benchmark/contexts/test_heat.py
@@ -185,9 +185,7 @@ class HeatContextTestCase(unittest.TestCase):
 
     def test_add_server_port(self):
         network1 = mock.MagicMock()
-        network1.vld_id = 'vld111'
         network2 = mock.MagicMock()
-        network2.vld_id = 'vld777'
         self.test_context.name = 'foo'
         self.test_context.stack = mock.MagicMock()
         self.test_context.networks = {
@@ -229,7 +227,6 @@ class HeatContextTestCase(unittest.TestCase):
             "network_name": 'a',
             "local_mac": '00:01',
             "local_ip": '10.20.30.45',
-            "vld_id": 'vld111',
         }
         self.test_context.add_server_port(server)
         self.assertEqual(server.private_ip, '10.20.30.45')

diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index deed4af..575467f 100644 (file)
--- a/yardstick/benchmark/contexts/heat.py
+++ b/yardstick/benchmark/contexts/heat.py
@@ -359,7 +359,6 @@ class HeatContext(Context):
             # to match vnf_generic
             "local_mac": mac_address,
             "local_ip": private_ip,
-            "vld_id": self.networks[network_name].vld_id,
         }
 
     def undeploy(self):

diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 2db96ba..0b8197c 100644 (file)
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -127,7 +127,6 @@ class Network(Object):
         if "external_network" in attrs:
             self.router = Router("router", self.name,
                                  context, attrs["external_network"])
-        self.vld_id = attrs.get("vld_id")
 
         Network.list.append(self)