diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-08-27 13:40:51 -0700 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-08-28 15:50:29 -0700 |
| commit | a5a2d9babbd0ef48e8e8ccf64a72dd9effa9f11d (patch) | |
| tree | f3b1a102a56cacdb44b9447ff434f2e9eb066b66 | |
| parent | a66b78d60d7d062218df8e6b9c279f7931a030cd (diff) | |
DRAFT: model: remove vld_id not needed
it seems vld_id is not needed now that
we add it in _resolve_topology.
Remove it from the model and Heat context first
and see what happens
Needs testing
Change-Id: I30d13c80bd90246ee3be67a2bd3439db45e20bcd
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
| -rw-r--r-- | tests/unit/benchmark/contexts/test_heat.py | 3 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 1 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/model.py | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/tests/unit/benchmark/contexts/test_heat.py b/tests/unit/benchmark/contexts/test_heat.py index 658a8e580..cc0c7bc8e 100644 --- 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 deed4af93..575467f8f 100644 --- 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 2db96bade..0b8197ce9 100644 --- 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) |