diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-31 00:53:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-31 00:53:00 +0000 |
| commit | 02b2d3e96ece24d7fc0f463d7a097e12f5605d6d (patch) | |
| tree | a20276aa0ac8d8667772c43d07ada22c2cb2a998 /nova/tests/unit/api | |
| parent | f8cc8b6863afe888de923b276411868ec8a052df (diff) | |
| parent | 8f5b7c67ca9fc528dfedf89c5f74cb067229e6e0 (diff) | |
| download | nova-02b2d3e96ece24d7fc0f463d7a097e12f5605d6d.tar.gz | |
Merge "Reject server operations with extended resource req"
Diffstat (limited to 'nova/tests/unit/api')
4 files changed, 28 insertions, 0 deletions
diff --git a/nova/tests/unit/api/openstack/compute/test_evacuate.py b/nova/tests/unit/api/openstack/compute/test_evacuate.py index 361a05e12b..3bb9dcea51 100644 --- a/nova/tests/unit/api/openstack/compute/test_evacuate.py +++ b/nova/tests/unit/api/openstack/compute/test_evacuate.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +import fixtures import mock from oslo_utils.fixture import uuidsentinel as uuids import testtools @@ -66,6 +67,12 @@ class EvacuateTestV21(test.NoDBTestCase): self.stub_out('nova.compute.api.API.get', fake_compute_api_get) self.stub_out('nova.compute.api.HostAPI.service_get_by_compute_host', fake_service_get_by_compute_host) + self.mock_neutron_extension_list = self.useFixture( + fixtures.MockPatch( + 'nova.network.neutron.API._refresh_neutron_extensions_cache' + ) + ).mock + self.mock_neutron_extension_list.return_value = {'extensions': []} self.UUID = uuids.fake for _method in self._methods: self.stub_out('nova.compute.api.API.%s' % _method, diff --git a/nova/tests/unit/api/openstack/compute/test_migrate_server.py b/nova/tests/unit/api/openstack/compute/test_migrate_server.py index 3872a5196b..b4b49f77a1 100644 --- a/nova/tests/unit/api/openstack/compute/test_migrate_server.py +++ b/nova/tests/unit/api/openstack/compute/test_migrate_server.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import fixtures import mock from oslo_utils.fixture import uuidsentinel as uuids from oslo_utils import uuidutils @@ -44,6 +45,12 @@ class MigrateServerTestsV21(admin_only_action_common.CommonTests): self.stub_out('nova.api.openstack.compute.migrate_server.' 'MigrateServerController', lambda *a, **kw: self.controller) + self.mock_neutron_extension_list = self.useFixture( + fixtures.MockPatch( + 'nova.network.neutron.API._refresh_neutron_extensions_cache' + ) + ).mock + self.mock_neutron_extension_list.return_value = {'extensions': []} def _get_migration_body(self, **kwargs): return {'os-migrateLive': self._get_params(**kwargs)} diff --git a/nova/tests/unit/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py index 006bac3033..0e31dd58db 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py @@ -14,6 +14,7 @@ # under the License. import ddt +import fixtures import mock from oslo_utils.fixture import uuidsentinel as uuids from oslo_utils import uuidutils @@ -99,6 +100,12 @@ class ServerActionsControllerTestV21(test.TestCase): self.controller.compute_api, 'compute_task_api') mock_conductor.start() self.addCleanup(mock_conductor.stop) + self.mock_neutron_extension_list = self.useFixture( + fixtures.MockPatch( + 'nova.network.neutron.API._refresh_neutron_extensions_cache' + ) + ).mock + self.mock_neutron_extension_list.return_value = {'extensions': []} def _get_controller(self): return self.servers.ServersController() diff --git a/nova/tests/unit/api/openstack/compute/test_shelve.py b/nova/tests/unit/api/openstack/compute/test_shelve.py index 5968850586..73e39e3c30 100644 --- a/nova/tests/unit/api/openstack/compute/test_shelve.py +++ b/nova/tests/unit/api/openstack/compute/test_shelve.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +import fixtures import mock import ddt @@ -104,6 +105,12 @@ class UnshelveServerControllerTestV277(test.NoDBTestCase): def setUp(self): super(UnshelveServerControllerTestV277, self).setUp() + self.mock_neutron_extension_list = self.useFixture( + fixtures.MockPatch( + 'nova.network.neutron.API._refresh_neutron_extensions_cache' + ) + ).mock + self.mock_neutron_extension_list.return_value = {'extensions': []} self.controller = shelve_v21.ShelveController() self.req = fakes.HTTPRequest.blank( '/%s/servers/a/action' % fakes.FAKE_PROJECT_ID, |