openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Expose locked status for Server"

This commit is contained in:
Zuul 2019-04-03 04:28:08 +00:00 committed by Gerrit Code Review
parent fb0acb7389 6c81f7362b
commit c7e3f3e7c6
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/compute/v2/server.py
View File

@ -137,6 +137,8 @@ class Server(resource.Resource, metadata.MetadataMixin, resource.TagMixin):
#: instance name template. Appears in the response for administrative users
#: only.
instance_name = resource.Body('OS-EXT-SRV-ATTR:instance_name')
# The locked status of the server
is_locked = resource.Body('locked', type=bool)
def _prepare_request(self, requires_id=True, prepend_key=True,
base_path=None):

7
openstack/tests/unit/cloud/test_normalize.py
View File

@ -66,6 +66,7 @@ RAW_SERVER_DICT = {
'progress': 0,
'request_ids': [],
'security_groups': [{u'name': u'default'}],
'locked': True,
'status': u'ACTIVE',
'tenant_id': u'db92b20496ae4fbda850a689ea9d563f',
'updated': u'2016-10-15T15:49:29Z',
@ -498,6 +499,7 @@ class TestNormalize(base.TestCase):
'OS-SCH-HNT:scheduler_hints': None,
'OS-SRV-USG:launched_at': u'2015-08-01T19:52:02.000000',
'OS-SRV-USG:terminated_at': None,
'locked': True,
'os-extended-volumes:volumes_attached': []},
'public_v4': None,
'public_v6': None,
@ -505,6 +507,7 @@ class TestNormalize(base.TestCase):
'scheduler_hints': None,
'security_groups': [{u'name': u'default'}],
'status': u'ACTIVE',
'locked': True,
'tags': [],
'task_state': None,
'tenant_id': u'db92b20496ae4fbda850a689ea9d563f',
@ -927,7 +930,9 @@ class TestStrictNormalize(base.TestCase):
'power_state': 1,
'private_v4': None,
'progress': 0,
'properties': {},
'properties': {
'locked': True
},
'public_v4': None,
'public_v6': None,
'scheduler_hints': None,

4
openstack/tests/unit/compute/v2/test_server.py
View File

@ -54,7 +54,8 @@ EXAMPLE = {
'OS-EXT-SRV-ATTR:hypervisor_hostname': 'hypervisor.example.com',
'OS-EXT-SRV-ATTR:instance_name': 'instance-00000001',
'OS-SCH-HNT:scheduler_hints': {'key': '30'},
'OS-EXT-SRV-ATTR:user_data': '31'
'OS-EXT-SRV-ATTR:user_data': '31',
'locked': True
}
@ -148,6 +149,7 @@ class TestServer(base.TestCase):
self.assertEqual(EXAMPLE['OS-SCH-HNT:scheduler_hints'],
sot.scheduler_hints)
self.assertEqual(EXAMPLE['OS-EXT-SRV-ATTR:user_data'], sot.user_data)
self.assertEqual(EXAMPLE['locked'], sot.is_locked)
def test__prepare_server(self):
zone = 1