From ab97fa0f1f9ed6acb78c1ceadec8b333eac73254 Mon Sep 17 00:00:00 2001 From: Vasyl Saienko Date: Tue, 17 May 2016 14:00:00 +0300 Subject: Add 'neutron' network interface This patch adds a 'neutron' network interface. This interface supports separate networks for provisioning and for cleaning of nodes. Partial-bug: #1526403 Co-Authored-By: Vladyslav Drok Change-Id: Ia3442ab3536a1a8d8839b24dbfc640b818450350 --- ironic/tests/unit/common/test_driver_factory.py | 2 +- ironic/tests/unit/common/test_network.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'ironic/tests/unit/common') diff --git a/ironic/tests/unit/common/test_driver_factory.py b/ironic/tests/unit/common/test_driver_factory.py index a8b286140..e83d81555 100644 --- a/ironic/tests/unit/common/test_driver_factory.py +++ b/ironic/tests/unit/common/test_driver_factory.py @@ -110,7 +110,7 @@ class NetworkInterfaceFactoryTestCase(db_base.DbTestCase): self.assertEqual(extension_mgr['flat'].obj, task.driver.network) self.assertEqual('ironic.hardware.interfaces.network', factory._entrypoint_name) - self.assertEqual(['flat', 'noop'], + self.assertEqual(['flat', 'neutron', 'noop'], sorted(factory._enabled_driver_list)) def test_build_driver_for_task_default_is_none(self): diff --git a/ironic/tests/unit/common/test_network.py b/ironic/tests/unit/common/test_network.py index e2240a993..a37267a06 100644 --- a/ironic/tests/unit/common/test_network.py +++ b/ironic/tests/unit/common/test_network.py @@ -95,15 +95,21 @@ class TestNetwork(db_base.DbTestCase): result = network.get_node_vif_ids(task) self.assertEqual(expected, result) - def test_get_node_vif_ids_during_cleaning(self): + def _test_get_node_vif_ids_multitenancy(self, int_info_key): port = db_utils.create_test_port( node_id=self.node.id, address='aa:bb:cc:dd:ee:ff', - internal_info={'cleaning_vif_port_id': 'test-vif-A'}) + internal_info={int_info_key: 'test-vif-A'}) portgroup = db_utils.create_test_portgroup( node_id=self.node.id, address='dd:ee:ff:aa:bb:cc', - internal_info={'cleaning_vif_port_id': 'test-vif-B'}) - expected = {'portgroups': {portgroup.uuid: 'test-vif-B'}, - 'ports': {port.uuid: 'test-vif-A'}} + internal_info={int_info_key: 'test-vif-B'}) + expected = {'ports': {port.uuid: 'test-vif-A'}, + 'portgroups': {portgroup.uuid: 'test-vif-B'}} with task_manager.acquire(self.context, self.node.uuid) as task: result = network.get_node_vif_ids(task) self.assertEqual(expected, result) + + def test_get_node_vif_ids_during_cleaning(self): + self._test_get_node_vif_ids_multitenancy('cleaning_vif_port_id') + + def test_get_node_vif_ids_during_provisioning(self): + self._test_get_node_vif_ids_multitenancy('provisioning_vif_port_id') -- cgit v1.2.1