openstack
/
nova
Code Issues Proposed changes

Stop handling cells v1 in '/os-servers' API 

Part of blueprint remove-cells-v1

Change-Id: Ic00b33cf5709d43bb204babc5f273b1049632cb9
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2019-04-04 14:45:16 +01:00
parent 27e88f6a66
commit 025e9294dd
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/api/openstack/compute/servers.py
View File

@ -1226,12 +1226,9 @@ class ServersController(wsgi.Controller):
def _get_instance(self, context, instance_uuid):
try:
attrs = ['system_metadata', 'metadata']
if not CONF.cells.enable:
# NOTE(danms): We can't target a cell database if we're
# in cellsv1 otherwise we'll short-circuit the replication.
mapping = objects.InstanceMapping.get_by_instance_uuid(
context, instance_uuid)
nova_context.set_target_cell(context, mapping.cell_mapping)
mapping = objects.InstanceMapping.get_by_instance_uuid(
context, instance_uuid)
nova_context.set_target_cell(context, mapping.cell_mapping)
return objects.Instance.get_by_uuid(
context, instance_uuid, expected_attrs=attrs)
except (exception.InstanceNotFound,

10
nova/tests/unit/api/openstack/compute/test_serversV21.py
View File

@ -262,16 +262,6 @@ class ServersControllerTest(ControllerTest):
use_admin_context=use_admin_context,
version=self.wsgi_api_version)
@mock.patch('nova.objects.Instance.get_by_uuid')
@mock.patch('nova.objects.InstanceMapping.get_by_instance_uuid')
def test_cellsv1_instance_lookup_no_target(self, mock_get_im,
mock_get_inst):
self.flags(enable=True, group='cells')
ctxt = context.RequestContext('fake', 'fake')
self.controller._get_instance(ctxt, 'foo')
self.assertFalse(mock_get_im.called)
self.assertIsNone(ctxt.db_connection)
@mock.patch('nova.objects.Instance.get_by_uuid')
@mock.patch('nova.objects.InstanceMapping.get_by_instance_uuid')
def test_instance_lookup_targets(self, mock_get_im, mock_get_inst):