openstack
/
senlin
Code Issues Proposed changes

Nova profile support node detail attached_volumes display 

Change-Id: I7efa60b7780ca8f3d611e09454ec21ce78c89db0
Signed-off-by: Yuanbin.Chen <cybing4@gmail.com>
This commit is contained in:
Yuanbin.Chen 2018-01-12 14:23:50 +08:00
parent 383b9b9843
commit c7444f1914
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
senlin/profiles/os/nova/server.py
View File

@ -1278,8 +1278,13 @@ class ServerProfile(base.Profile):
image_id = server_data['image']['id']
else:
image_id = server_data['image']
attached_volumes = []
if len(server_data['attached_volumes']) > 0:
for volume in server_data['attached_volumes']:
attached_volumes.append(volume['id'])
details = {
'image': image_id,
'attached_volumes': attached_volumes,
'flavor': server_data['flavor']['id'],
}
for key in known_keys:

59
senlin/tests/unit/profiles/test_nova_server.py
View File

@ -704,6 +704,9 @@ class TestNovaServerBasic(base.SenlinTestCase):
'rel': 'bookmark'
}],
},
'attached_volumes': [{
'id': 'FAKE_VOLUME',
}],
'key_name': 'FAKE_KEY',
'links': [{
'href': 'http://url1',
@ -714,7 +717,6 @@ class TestNovaServerBasic(base.SenlinTestCase):
}],
'metadata': {},
'name': 'FAKE_NAME',
'os-extended-volumes:volumes_attached': [],
'progress': 0,
'security_groups': [{'name': 'default'}],
'status': 'FAKE_STATUS',
@ -740,10 +742,10 @@ class TestNovaServerBasic(base.SenlinTestCase):
'hostId': 'FAKE_HOST_ID',
'id': 'FAKE_ID',
'image': 'FAKE_IMAGE',
'attached_volumes': ['FAKE_VOLUME'],
'key_name': 'FAKE_KEY',
'metadata': {},
'name': 'FAKE_NAME',
'os-extended-volumes:volumes_attached': [],
'addresses': {
'private': [{
'OS-EXT-IPS-MAC:mac_addr': 'fa:16:3e:5e:00:81',
@ -777,6 +779,9 @@ class TestNovaServerBasic(base.SenlinTestCase):
'image': {
'id': 'FAKE_IMAGE',
},
'attached_volumes': [{
'id': 'FAKE_VOLUME',
}],
'security_groups': [],
}
cc.server_get.return_value = nova_server
@ -785,6 +790,7 @@ class TestNovaServerBasic(base.SenlinTestCase):
'flavor': 'FAKE_FLAVOR',
'id': 'FAKE_ID',
'image': 'FAKE_IMAGE',
'attached_volumes': ['FAKE_VOLUME'],
'addresses': {},
'security_groups': '',
}
@ -811,6 +817,9 @@ class TestNovaServerBasic(base.SenlinTestCase):
},
'id': 'FAKE_ID',
'image': {},
'attached_volumes': [{
'id': 'FAKE_VOLUME',
}],
'security_groups': [{'name': 'default'}],
}
cc.server_get.return_value = nova_server
@ -819,6 +828,48 @@ class TestNovaServerBasic(base.SenlinTestCase):
'flavor': 'FAKE_FLAVOR',
'id': 'FAKE_ID',
'image': {},
'attached_volumes': ['FAKE_VOLUME'],
'addresses': {
'private': [{
'version': 4,
'addr': '10.0.0.3',
}]
},
'security_groups': 'default',
}
self.assertEqual(expected, res)
cc.server_get.assert_called_once_with('FAKE_ID')
def test_do_get_details_bdm_no_id_key(self):
cc = mock.Mock()
profile = server.ServerProfile('t', self.spec)
profile._computeclient = cc
node_obj = mock.Mock(physical_id='FAKE_ID')
# Test normal path
nova_server = mock.Mock()
nova_server.to_dict.return_value = {
'addresses': {
'private': [{
'version': 4,
'addr': '10.0.0.3',
}]
},
'flavor': {
'id': 'FAKE_FLAVOR',
},
'id': 'FAKE_ID',
'image': {},
'attached_volumes': [],
'security_groups': [{'name': 'default'}],
}
cc.server_get.return_value = nova_server
res = profile.do_get_details(node_obj)
expected = {
'flavor': 'FAKE_FLAVOR',
'id': 'FAKE_ID',
'image': {},
'attached_volumes': [],
'addresses': {
'private': [{
'version': 4,
@ -859,6 +910,9 @@ class TestNovaServerBasic(base.SenlinTestCase):
'image': {
'id': 'FAKE_IMAGE',
},
'attached_volumes': [{
'id': 'FAKE_VOLUME',
}],
'security_groups': [{
'name': 'default',
}, {
@ -871,6 +925,7 @@ class TestNovaServerBasic(base.SenlinTestCase):
'flavor': 'FAKE_FLAVOR',
'id': 'FAKE_ID',
'image': 'FAKE_IMAGE',
'attached_volumes': ['FAKE_VOLUME'],
'addresses': {
'private': [{
'version': 4,