Merge "Merge extended_status extension response into server view builder"
This commit is contained in:
Zuul
Gerrit Code Review
commit
a899e09cfe
|
|
@ -1,47 +0,0 @@
|
|||
# Copyright 2011 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""The Extended Status Admin API extension."""
|
||||
|
||||
from nova.api.openstack import wsgi
|
||||
|
||||
|
||||
class ExtendedStatusController(wsgi.Controller):
|
||||
def _extend_server(self, server, instance):
|
||||
# Note(gmann): Removed 'locked_by' from extended status
|
||||
# to make it same as V2. If needed it can be added with
|
||||
# microversion.
|
||||
for state in ['task_state', 'vm_state', 'power_state']:
|
||||
# NOTE(mriedem): The OS-EXT-STS prefix should not be used for new
|
||||
# attributes after v2.1. They are only in v2.1 for backward compat
|
||||
# with v2.0.
|
||||
key = "%s:%s" % ('OS-EXT-STS', state)
|
||||
server[key] = instance[state]
|
||||
|
||||
@wsgi.extends
|
||||
def show(self, req, resp_obj, id):
|
||||
server = resp_obj.obj['server']
|
||||
db_instance = req.get_db_instance(server['id'])
|
||||
# server['id'] is guaranteed to be in the cache due to
|
||||
# the core API adding it in its 'show' method.
|
||||
self._extend_server(server, db_instance)
|
||||
|
||||
@wsgi.extends
|
||||
def detail(self, req, resp_obj):
|
||||
servers = list(resp_obj.obj['servers'])
|
||||
for server in servers:
|
||||
db_instance = req.get_db_instance(server['id'])
|
||||
# server['id'] is guaranteed to be in the cache due to
|
||||
# the core API adding it in its 'detail' method.
|
||||
self._extend_server(server, db_instance)
|
||||
|
|
@ -35,7 +35,6 @@ from nova.api.openstack.compute import consoles
|
|||
from nova.api.openstack.compute import create_backup
|
||||
from nova.api.openstack.compute import deferred_delete
|
||||
from nova.api.openstack.compute import evacuate
|
||||
from nova.api.openstack.compute import extended_status
|
||||
from nova.api.openstack.compute import extended_volumes
|
||||
from nova.api.openstack.compute import extension_info
|
||||
from nova.api.openstack.compute import fixed_ips
|
||||
|
|
@ -266,7 +265,6 @@ security_group_rules_controller = functools.partial(_create_controller,
|
|||
server_controller = functools.partial(_create_controller,
|
||||
servers.ServersController,
|
||||
[
|
||||
extended_status.ExtendedStatusController,
|
||||
extended_volumes.ExtendedVolumesController,
|
||||
hide_server_addresses.Controller,
|
||||
],
|
||||
|
|
|
|||
|
|
@ -724,7 +724,8 @@ class ServersController(wsgi.Controller):
|
|||
show_host_status=False,
|
||||
show_keypair=False,
|
||||
show_srv_usg=False,
|
||||
show_sec_grp=False)
|
||||
show_sec_grp=False,
|
||||
show_extended_status=False)
|
||||
except exception.InstanceNotFound:
|
||||
msg = _("Instance could not be found")
|
||||
raise exc.HTTPNotFound(explanation=msg)
|
||||
|
|
@ -999,7 +1000,8 @@ class ServersController(wsgi.Controller):
|
|||
show_host_status=False,
|
||||
show_keypair=show_keypair,
|
||||
show_srv_usg=False,
|
||||
show_sec_grp=False)
|
||||
show_sec_grp=False,
|
||||
show_extended_status=False)
|
||||
|
||||
# Add on the admin_password attribute since the view doesn't do it
|
||||
# unless instance passwords are disabled
|
||||
|
|
|
|||
|
|
@ -127,7 +127,8 @@ class ViewBuilder(common.ViewBuilder):
|
|||
def show(self, request, instance, extend_address=True,
|
||||
show_extra_specs=None, show_AZ=True, show_config_drive=True,
|
||||
show_extended_attr=None, show_host_status=None,
|
||||
show_keypair=True, show_srv_usg=True, show_sec_grp=True):
|
||||
show_keypair=True, show_srv_usg=True, show_sec_grp=True,
|
||||
show_extended_status=True):
|
||||
"""Detailed view of a single instance."""
|
||||
ip_v4 = instance.get('access_ip_v4')
|
||||
ip_v6 = instance.get('access_ip_v6')
|
||||
|
|
@ -228,6 +229,16 @@ class ViewBuilder(common.ViewBuilder):
|
|||
# the OS-EXT-SRV-ATTR prefix for the attribute key name.
|
||||
key = "OS-EXT-SRV-ATTR:%s" % attr
|
||||
server["server"][key] = instance[attr]
|
||||
if show_extended_status:
|
||||
# NOTE(gmann): Removed 'locked_by' from extended status
|
||||
# to make it same as V2. If needed it can be added with
|
||||
# microversion.
|
||||
for state in ['task_state', 'vm_state', 'power_state']:
|
||||
# NOTE(mriedem): The OS-EXT-STS prefix should not be used for
|
||||
# new attributes after v2.1. They are only in v2.1 for backward
|
||||
# compat with v2.0.
|
||||
key = "%s:%s" % ('OS-EXT-STS', state)
|
||||
server["server"][key] = instance[state]
|
||||
if (api_version_request.is_supported(request, min_version='2.16')):
|
||||
if show_host_status is None:
|
||||
show_host_status = context.can(
|
||||
|
|
|
|||
|
|
@ -1,116 +0,0 @@
|
|||
# Copyright 2011 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
from nova.tests.unit import fake_instance
|
||||
|
||||
UUID1 = '00000000-0000-0000-0000-000000000001'
|
||||
UUID2 = '00000000-0000-0000-0000-000000000002'
|
||||
UUID3 = '00000000-0000-0000-0000-000000000003'
|
||||
|
||||
|
||||
def fake_compute_get(*args, **kwargs):
|
||||
inst = fakes.stub_instance(1, uuid=UUID3, task_state="kayaking",
|
||||
vm_state="slightly crunchy", power_state=1)
|
||||
return fake_instance.fake_instance_obj(args[1], **inst)
|
||||
|
||||
|
||||
def fake_compute_get_all(*args, **kwargs):
|
||||
db_list = [
|
||||
fakes.stub_instance(1, uuid=UUID1, task_state="task-1",
|
||||
vm_state="vm-1", power_state=1),
|
||||
fakes.stub_instance(2, uuid=UUID2, task_state="task-2",
|
||||
vm_state="vm-2", power_state=2),
|
||||
]
|
||||
|
||||
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
|
||||
return instance_obj._make_instance_list(args[1],
|
||||
objects.InstanceList(),
|
||||
db_list, fields)
|
||||
|
||||
|
||||
class ExtendedStatusTestV21(test.TestCase):
|
||||
content_type = 'application/json'
|
||||
prefix = 'OS-EXT-STS:'
|
||||
fake_url = '/v2/fake'
|
||||
|
||||
def _set_flags(self):
|
||||
pass
|
||||
|
||||
def _make_request(self, url):
|
||||
req = fakes.HTTPRequest.blank(url)
|
||||
req.headers['Accept'] = self.content_type
|
||||
res = req.get_response(fakes.wsgi_app_v21())
|
||||
return res
|
||||
|
||||
def setUp(self):
|
||||
super(ExtendedStatusTestV21, self).setUp()
|
||||
fakes.stub_out_nw_api(self)
|
||||
fakes.stub_out_secgroup_api(self)
|
||||
self.stub_out('nova.compute.api.API.get', fake_compute_get)
|
||||
self.stub_out('nova.compute.api.API.get_all', fake_compute_get_all)
|
||||
self._set_flags()
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stub_out('nova.db.api.instance_get_by_uuid', return_server)
|
||||
|
||||
def _get_server(self, body):
|
||||
return jsonutils.loads(body).get('server')
|
||||
|
||||
def _get_servers(self, body):
|
||||
return jsonutils.loads(body).get('servers')
|
||||
|
||||
def assertServerStates(self, server, vm_state, power_state, task_state):
|
||||
self.assertEqual(server.get('%svm_state' % self.prefix), vm_state)
|
||||
self.assertEqual(int(server.get('%spower_state' % self.prefix)),
|
||||
power_state)
|
||||
self.assertEqual(server.get('%stask_state' % self.prefix), task_state)
|
||||
|
||||
def test_show(self):
|
||||
url = self.fake_url + '/servers/%s' % UUID3
|
||||
res = self._make_request(url)
|
||||
|
||||
self.assertEqual(res.status_int, 200)
|
||||
self.assertServerStates(self._get_server(res.body),
|
||||
vm_state='slightly crunchy',
|
||||
power_state=1,
|
||||
task_state='kayaking')
|
||||
|
||||
def test_detail(self):
|
||||
url = self.fake_url + '/servers/detail'
|
||||
res = self._make_request(url)
|
||||
|
||||
self.assertEqual(res.status_int, 200)
|
||||
for i, server in enumerate(self._get_servers(res.body)):
|
||||
self.assertServerStates(server,
|
||||
vm_state='vm-%s' % (i + 1),
|
||||
power_state=(i + 1),
|
||||
task_state='task-%s' % (i + 1))
|
||||
|
||||
def test_no_instance_passthrough_404(self):
|
||||
|
||||
def fake_compute_get(*args, **kwargs):
|
||||
raise exception.InstanceNotFound(instance_id='fake')
|
||||
|
||||
self.stub_out('nova.compute.api.API.get', fake_compute_get)
|
||||
url = self.fake_url + '/servers/70f6db34-de8d-4fbd-aafb-4065bdfa6115'
|
||||
res = self._make_request(url)
|
||||
|
||||
self.assertEqual(res.status_int, 404)
|
||||
|
|
@ -177,7 +177,10 @@ class ControllerTest(test.TestCase):
|
|||
return_server = fakes.fake_compute_get(id=2, availability_zone='nova',
|
||||
launched_at=None,
|
||||
terminated_at=None,
|
||||
security_groups=security_groups)
|
||||
security_groups=security_groups,
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
return_servers = fakes.fake_compute_get_all()
|
||||
# Server sort keys extension is enabled in v21 so sort data is passed
|
||||
# to the instance API and the sorted DB API is invoked
|
||||
|
|
@ -404,7 +407,10 @@ class ServersControllerTest(ControllerTest):
|
|||
"OS-SRV-USG:launched_at": None,
|
||||
"OS-SRV-USG:terminated_at": None,
|
||||
"security_groups": [{'name': 'fake-0-0'},
|
||||
{'name': 'fake-0-1'}]
|
||||
{'name': 'fake-0-1'}],
|
||||
"OS-EXT-STS:task_state": None,
|
||||
"OS-EXT-STS:vm_state": vm_states.ACTIVE,
|
||||
"OS-EXT-STS:power_state": 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1529,7 +1535,10 @@ class ServersControllerTestV23(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
def _get_server_data_dict(self, uuid, image_bookmark, flavor_bookmark,
|
||||
status="ACTIVE", progress=100):
|
||||
|
|
@ -1548,6 +1557,9 @@ class ServersControllerTestV23(ServersControllerTest):
|
|||
server_dict['server']["OS-EXT-SRV-ATTR:reservation_id"] = "r-1"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:root_device_name"] = "/dev/vda"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:user_data"] = "userdata"
|
||||
server_dict['server']["OS-EXT-STS:task_state"] = None
|
||||
server_dict['server']["OS-EXT-STS:vm_state"] = vm_states.ACTIVE
|
||||
server_dict['server']["OS-EXT-STS:power_state"] = 1
|
||||
return server_dict
|
||||
|
||||
def test_show(self):
|
||||
|
|
@ -1591,7 +1603,10 @@ class ServersControllerTestV23(ServersControllerTest):
|
|||
'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz',
|
||||
'deleted': False, 'deleted_at': None,
|
||||
'updated_at': None, 'created_at': None}])
|
||||
'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
obj_list.append(server)
|
||||
return objects.InstanceList(objects=obj_list)
|
||||
|
||||
|
|
@ -1633,7 +1648,10 @@ class ServersControllerTestV29(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
def _get_server_data_dict(self, uuid, image_bookmark, flavor_bookmark,
|
||||
status="ACTIVE", progress=100):
|
||||
|
|
@ -1653,6 +1671,9 @@ class ServersControllerTestV29(ServersControllerTest):
|
|||
server_dict['server']["OS-EXT-SRV-ATTR:reservation_id"] = "r-1"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:root_device_name"] = "/dev/vda"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:user_data"] = "userdata"
|
||||
server_dict['server']["OS-EXT-STS:task_state"] = None
|
||||
server_dict['server']["OS-EXT-STS:vm_state"] = vm_states.ACTIVE
|
||||
server_dict['server']["OS-EXT-STS:power_state"] = 1
|
||||
return server_dict
|
||||
|
||||
def _test_get_server_with_lock(self, locked_by):
|
||||
|
|
@ -1676,7 +1697,10 @@ class ServersControllerTestV29(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
req = self.req('/fake/servers/%s' % FAKE_UUID)
|
||||
res_dict = self.controller.show(req, FAKE_UUID)
|
||||
|
|
@ -1723,7 +1747,10 @@ class ServersControllerTestV29(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
req = self.req('/fake/servers/detail')
|
||||
servers_list = self.controller.detail(req)
|
||||
|
|
@ -1788,7 +1815,10 @@ class ServersControllerTestV216(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
self.useFixture(fixtures.MockPatchObject(
|
||||
compute_api.API, 'get_instance_host_status',
|
||||
return_value='UP')).mock
|
||||
|
|
@ -1812,6 +1842,9 @@ class ServersControllerTestV216(ServersControllerTest):
|
|||
server_dict['server']["OS-EXT-SRV-ATTR:reservation_id"] = "r-1"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:root_device_name"] = "/dev/vda"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:user_data"] = "userdata"
|
||||
server_dict['server']["OS-EXT-STS:task_state"] = None
|
||||
server_dict['server']["OS-EXT-STS:vm_state"] = vm_states.ACTIVE
|
||||
server_dict['server']["OS-EXT-STS:power_state"] = 1
|
||||
|
||||
return server_dict
|
||||
|
||||
|
|
@ -1854,7 +1887,10 @@ class ServersControllerTestV216(ServersControllerTest):
|
|||
'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz',
|
||||
'deleted': False, 'deleted_at': None,
|
||||
'updated_at': None, 'created_at': None}])
|
||||
'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
obj_list.append(server)
|
||||
return objects.InstanceList(objects=obj_list)
|
||||
|
||||
|
|
@ -1896,7 +1932,10 @@ class ServersControllerTestV219(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
self.useFixture(fixtures.MockPatchObject(
|
||||
compute_api.API, 'get_instance_host_status',
|
||||
return_value='UP')).mock
|
||||
|
|
@ -1921,6 +1960,9 @@ class ServersControllerTestV219(ServersControllerTest):
|
|||
server_dict['server']["OS-EXT-SRV-ATTR:reservation_id"] = "r-1"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:root_device_name"] = "/dev/vda"
|
||||
server_dict['server']["OS-EXT-SRV-ATTR:user_data"] = "userdata"
|
||||
server_dict['server']["OS-EXT-STS:task_state"] = None
|
||||
server_dict['server']["OS-EXT-STS:vm_state"] = vm_states.ACTIVE
|
||||
server_dict['server']["OS-EXT-STS:power_state"] = 1
|
||||
|
||||
return server_dict
|
||||
|
||||
|
|
@ -1945,7 +1987,10 @@ class ServersControllerTestV219(ServersControllerTest):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
req = self.req('/fake/servers/%s' % FAKE_UUID)
|
||||
res_dict = self.controller.show(req, FAKE_UUID)
|
||||
|
|
@ -6277,7 +6322,10 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
'deleted_at': None, 'updated_at': None, 'created_at': None},
|
||||
{'name': 'fake-0-1', 'id': 1, 'description': 'foo',
|
||||
'user_id': 'bar', 'project_id': 'baz', 'deleted': False,
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}])
|
||||
'deleted_at': None, 'updated_at': None, 'created_at': None}],
|
||||
task_state=None,
|
||||
vm_state=vm_states.ACTIVE,
|
||||
power_state=1)
|
||||
|
||||
privates = ['172.19.0.1']
|
||||
publics = ['192.168.0.3']
|
||||
|
|
@ -6460,7 +6508,10 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
"OS-SRV-USG:launched_at": None,
|
||||
"OS-SRV-USG:terminated_at": None,
|
||||
"security_groups": [{'name': 'fake-0-0'},
|
||||
{'name': 'fake-0-1'}]
|
||||
{'name': 'fake-0-1'}],
|
||||
"OS-EXT-STS:task_state": None,
|
||||
"OS-EXT-STS:vm_state": vm_states.ACTIVE,
|
||||
"OS-EXT-STS:power_state": 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6549,8 +6600,10 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
"OS-SRV-USG:launched_at": None,
|
||||
"OS-SRV-USG:terminated_at": None,
|
||||
"security_groups": [{'name': 'fake-0-0'},
|
||||
{'name': 'fake-0-1'}]
|
||||
|
||||
{'name': 'fake-0-1'}],
|
||||
"OS-EXT-STS:task_state": None,
|
||||
"OS-EXT-STS:vm_state": vm_states.ERROR,
|
||||
"OS-EXT-STS:power_state": 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6738,7 +6791,10 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
"OS-SRV-USG:launched_at": None,
|
||||
"OS-SRV-USG:terminated_at": None,
|
||||
"security_groups": [{'name': 'fake-0-0'},
|
||||
{'name': 'fake-0-1'}]
|
||||
{'name': 'fake-0-1'}],
|
||||
"OS-EXT-STS:task_state": None,
|
||||
"OS-EXT-STS:vm_state": vm_states.ACTIVE,
|
||||
"OS-EXT-STS:power_state": 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6824,7 +6880,10 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
"OS-SRV-USG:launched_at": None,
|
||||
"OS-SRV-USG:terminated_at": None,
|
||||
"security_groups": [{'name': 'fake-0-0'},
|
||||
{'name': 'fake-0-1'}]
|
||||
{'name': 'fake-0-1'}],
|
||||
"OS-EXT-STS:task_state": None,
|
||||
"OS-EXT-STS:vm_state": vm_states.ACTIVE,
|
||||
"OS-EXT-STS:power_state": 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue