diff options
author | Shivanand Tendulker <stendulker@gmail.com> | 2017-11-16 11:43:16 -0500 |
---|---|---|
committer | Shivanand Tendulker <stendulker@gmail.com> | 2018-01-22 11:37:32 -0500 |
commit | fbee0981ad0afe304e58006609eabf35cfe89489 (patch) | |
tree | 1849d42aa982e96e56fbd03f13ac91b4b58473f3 /ironic/tests/unit/drivers/modules/network/test_common.py | |
parent | 084da02a324ac9271b678fd029e3352b9bdb04dc (diff) | |
download | ironic-fbee0981ad0afe304e58006609eabf35cfe89489.tar.gz |
Add rescue related methods to network interface
Adds methods `add_rescuing_network` and `remove_rescuing_network`
to add/remove rescuing network to `network` interface.
These methods are not added to `flat` network interface.
The 'flat' network uses same network for tenant and provisioning.
It makes sense to use the same for rescuing as well; as opposed
to a separate network like we have for cleaning.
Change-Id: I8f4123bfe7d293e8ff6f3bfc2f25445a39c94c73
Related-bug: #1526449
Co-Authored-By: Jay Faulkner <jay@jvf.cc>
Co-Authored-By: Mario Villaplana <mario.villaplana@gmail.com>
Co-Authored-By: Jesse J. Cook <jesse.j.cook@member.fsf.org>
Co-Authored-By: Aparna <aparnavtce@gmail.com>
Co-Authored-By: Shivanand Tendulker <stendulker@gmail.com>
Diffstat (limited to 'ironic/tests/unit/drivers/modules/network/test_common.py')
-rw-r--r-- | ironic/tests/unit/drivers/modules/network/test_common.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ironic/tests/unit/drivers/modules/network/test_common.py b/ironic/tests/unit/drivers/modules/network/test_common.py index 4fc0d513a..a64fc348f 100644 --- a/ironic/tests/unit/drivers/modules/network/test_common.py +++ b/ironic/tests/unit/drivers/modules/network/test_common.py @@ -626,7 +626,7 @@ class TestVifPortIDMixin(db_base.DbTestCase): def test_get_current_vif_internal_info_provisioning(self): internal_info = {'provisioning_vif_port_id': 'foo', - 'vif_port_id': 'bar'} + 'tenant_vif_port_id': 'bar'} self.port.internal_info = internal_info self.port.save() with task_manager.acquire(self.context, self.node.id) as task: @@ -641,6 +641,15 @@ class TestVifPortIDMixin(db_base.DbTestCase): vif = self.interface.get_current_vif(task, self.port) self.assertEqual('bar', vif) + def test_get_current_vif_internal_info_rescuing(self): + internal_info = {'rescuing_vif_port_id': 'foo', + 'tenant_vif_port_id': 'bar'} + self.port.internal_info = internal_info + self.port.save() + with task_manager.acquire(self.context, self.node.id) as task: + vif = self.interface.get_current_vif(task, self.port) + self.assertEqual('foo', vif) + def test_get_current_vif_none(self): internal_info = extra = {} self.port.internal_info = internal_info |