From e01eec48d7a93fbbf607e32f659bb6506cfcb92f Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 14 Nov 2016 15:36:12 -0500 Subject: [PATCH] Make test_shelve work with CONF.use_neutron=True by default This is pretty simple, just needed to stub out some network API methods in a more generic way. Part of blueprint use-neutron-by-default Change-Id: Ic62c1ae090294ecb2200299775b35b67ab1bbf12 --- nova/tests/unit/compute/test_compute.py | 9 +++++++-- nova/tests/unit/compute/test_shelve.py | 12 ++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py index 9223549070c..069bdb90606 100644 --- a/nova/tests/unit/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -238,8 +238,13 @@ def fake_show(meh, context, id, **kwargs): def fake_get_nw_info(cls, ctxt, instance, *args, **kwargs): return network_model.NetworkInfo() - self.stub_out('nova.network.api.API.get_instance_nw_info', - fake_get_nw_info) + if CONF.use_neutron: + self.stub_out( + 'nova.network.neutronv2.api.API.get_instance_nw_info', + fake_get_nw_info) + else: + self.stub_out('nova.network.api.API.get_instance_nw_info', + fake_get_nw_info) def fake_allocate_for_instance(cls, ctxt, instance, *args, **kwargs): self.assertFalse(ctxt.is_admin) diff --git a/nova/tests/unit/compute/test_shelve.py b/nova/tests/unit/compute/test_shelve.py index 7a56cd88ff1..74ef6ee77d8 100644 --- a/nova/tests/unit/compute/test_shelve.py +++ b/nova/tests/unit/compute/test_shelve.py @@ -21,6 +21,7 @@ import nova.conf from nova import db from nova import objects +from nova import test from nova.tests.unit.compute import test_compute from nova.tests.unit.image import fake as fake_image from nova.tests import uuidsentinel as uuids @@ -43,8 +44,6 @@ def _fake_resources(): class ShelveComputeManagerTestCase(test_compute.BaseTestCase): - @mock.patch.object(nova.network.api.API, - 'cleanup_instance_network_on_host') @mock.patch.object(nova.virt.fake.SmallFakeDriver, 'power_off') @mock.patch.object(nova.virt.fake.SmallFakeDriver, 'snapshot') @mock.patch.object(nova.compute.manager.ComputeManager, '_get_power_state') @@ -53,7 +52,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase): @mock.patch('nova.compute.utils.notify_about_instance_action') def _shelve_instance(self, shelved_offload_time, mock_notify, mock_notify_instance_usage, mock_get_power_state, - mock_snapshot, mock_power_off, mock_cleanup, + mock_snapshot, mock_power_off, clean_shutdown=True): mock_get_power_state.return_value = 123 @@ -103,7 +102,12 @@ def check_save(expected_task_state=None): else: self.fail('Unexpected save!') - with mock.patch.object(instance, 'save') as mock_save: + with test.nested( + mock.patch.object(instance, 'save'), + mock.patch.object(self.compute.network_api, + 'cleanup_instance_network_on_host')) as ( + mock_save, mock_cleanup + ): mock_save.side_effect = check_save self.compute.shelve_instance(self.context, instance, image_id=image_id,