openstack
/
senlin
Code Issues Proposed changes

Rename image_get_by_name to image_find 

This patch renames image_get_by_name method to image_find since
openstacksdk can now support image finding using both name and ID
correctly.

Change-Id: Ie0984225e57c00010bc50bb5571120976605dd1e
This commit is contained in:
yanyanhu 2015-11-26 00:28:52 -05:00
parent 244226bd9e
commit c2ec442b73
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/support-nova-image-find-8f66ea48e127873c.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Both image ID and image name are supported when creating os.nova.server
profile.

2
senlin/drivers/openstack/nova_v2.py
View File

@ -55,7 +55,7 @@ class NovaClient(base.DriverBase):
return self.conn.compute.get_image(value)
@sdk.translate_exception
def image_get_by_name(self, name_or_id, ignore_missing=False):
def image_find(self, name_or_id, ignore_missing=False):
return self.conn.compute.find_image(name_or_id, ignore_missing)
@sdk.translate_exception

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

@ -242,7 +242,7 @@ class ServerProfile(base.Profile):
name_or_id = self.properties[self.IMAGE]
if name_or_id is not None:
image = self.nova(obj).image_get_by_name(name_or_id)
image = self.nova(obj).image_find(name_or_id)
# wait for new version of openstacksdk to fix this
kwargs.pop(self.IMAGE)
kwargs['imageRef'] = image.id
@ -363,14 +363,14 @@ class ServerProfile(base.Profile):
'''Updating server image'''
if old_image:
res = self.nova(obj).image_get_by_name(old_image)
res = self.nova(obj).image_find(old_image)
image_id = res.id
else:
server = self.nova(obj).server_get(obj.physical_id)
image_id = server.image['id']
if new_image:
res = self.nova(obj).image_get_by_name(new_image)
res = self.nova(obj).image_find(new_image)
new_image_id = res.id
if new_image_id != image_id:
self.nova(obj).rebuild_server(obj.physical_id, new_image_id)

2
senlin/tests/functional/drivers/openstack/nova_v2.py
View File

@ -124,7 +124,7 @@ class NovaClient(base.DriverBase):
def flavor_find(self, name_or_id, ignore_missing=False):
return sdk.FakeResourceObject(self.fake_flavor)
def image_get_by_name(self, name_or_id, ignore_missing=False):
def image_find(self, name_or_id, ignore_missing=False):
return sdk.FakeResourceObject(self.fake_image)
def server_create(self, **attrs):

8
senlin/tests/unit/drivers/test_nova_v2.py
View File

@ -103,17 +103,17 @@ class TestNovaV2(base.SenlinTestCase):
d.image_get('foo')
self.compute.get_image.assert_called_once_with('foo')
def test_image_get_by_name(self):
def test_image_find(self):
d = nova_v2.NovaClient(self.conn_params)
d.image_get_by_name('foo')
d.image_find('foo')
self.compute.find_image.assert_called_once_with('foo', False)
self.compute.find_image.reset_mock()
d.image_get_by_name('foo', True)
d.image_find('foo', True)
self.compute.find_image.assert_called_once_with('foo', True)
self.compute.find_image.reset_mock()
d.image_get_by_name('foo', False)
d.image_find('foo', False)
self.compute.find_image.assert_called_once_with('foo', False)
def test_image_list(self):

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

@ -155,7 +155,7 @@ class TestNovaServerProfile(base.SenlinTestCase):
}
image = mock.Mock()
image.id = 'FAKE_IMAGE_ID'
novaclient.image_get_by_name.return_value = image
novaclient.image_find.return_value = image
flavor = mock.Mock()
flavor.id = 'FAKE_FLAVOR_ID'
novaclient.flavor_find.return_value = flavor
@ -174,7 +174,7 @@ class TestNovaServerProfile(base.SenlinTestCase):
server_id = profile.do_create(test_server)
mock_random_name.assert_called_once_with(8)
novaclient.image_get_by_name.assert_called_once_with('FAKE_IMAGE')
novaclient.image_find.assert_called_once_with('FAKE_IMAGE')
novaclient.flavor_find.assert_called_once_with('FLAV', False)
neutronclient.network_get.assert_called_once_with('FAKE_NET')
@ -230,7 +230,7 @@ class TestNovaServerProfile(base.SenlinTestCase):
test_server.data = {}
image = mock.Mock()
image.id = 'FAKE_IMAGE_ID'
novaclient.image_get_by_name.return_value = image
novaclient.image_find.return_value = image
flavor = mock.Mock()
flavor.id = 'FAKE_FLAVOR_ID'
novaclient.flavor_find.return_value = flavor
@ -613,13 +613,13 @@ class TestNovaServerProfile(base.SenlinTestCase):
mock_new_image = mock.Mock()
mock_new_image.id = '456'
novaclient = mock.Mock()
novaclient.image_get_by_name.side_effect = [mock_old_image,
mock_new_image]
novaclient.image_find.side_effect = [mock_old_image,
mock_new_image]
profile = server.ServerProfile('t', self.spec)
profile._novaclient = novaclient
profile._update_image(obj, 'old_image', 'new_image')
novaclient.image_get_by_name.has_calls(
novaclient.image_find.has_calls(
[mock.call('old_image'), mock.call('new_image')])
novaclient.rebuild_server.assert_called_once_with('FAKE_ID',
'456')
@ -639,12 +639,12 @@ class TestNovaServerProfile(base.SenlinTestCase):
novaclient.server_get.return_value = mock_server
mock_image = mock.Mock()
mock_image.id = '456'
novaclient.image_get_by_name.return_value = mock_image
novaclient.image_find.return_value = mock_image
profile = server.ServerProfile('t', self.spec)
profile._novaclient = novaclient
profile._update_image(obj, None, 'new_image')
novaclient.image_get_by_name.assert_called_once_with('new_image')
novaclient.image_find.assert_called_once_with('new_image')
novaclient.server_get.assert_called_once_with('FAKE_ID')
novaclient.rebuild_server.assert_called_once_with('FAKE_ID',
'456')
@ -655,7 +655,7 @@ class TestNovaServerProfile(base.SenlinTestCase):
novaclient = mock.Mock()
mock_image = mock.Mock()
mock_image.id = '123'
novaclient.image_get_by_name.return_value = mock_image
novaclient.image_find.return_value = mock_image
profile = server.ServerProfile('t', self.spec)
profile._novaclient = novaclient
@ -664,7 +664,7 @@ class TestNovaServerProfile(base.SenlinTestCase):
obj, 'old_image', None)
msg = _("Failed in updating FAKE_ID.")
self.assertEqual(msg, six.text_type(ex))
novaclient.image_get_by_name.assert_called_once_with('old_image')
novaclient.image_find.assert_called_once_with('old_image')
def test_do_update_no_physical_id(self):
profile = server.ServerProfile('t', self.spec)