openstack/openstacksdk
Code Issues Proposed changes

Merge "Fix up image and flavor by name in create_server"

Browse Source
This commit is contained in:
Jenkins 2016-09-01 23:32:40 +00:00 committed by Gerrit Code Review
commit fb26f6e5e4
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shade/openstackcloud.py
View File

@ -4550,11 +4550,11 @@ class OpenStackCloud(object):
if image:
if isinstance(image, dict):
kwargs['image'] = image
kwargs['image'] = image['id']
else:
kwargs['image'] = self.get_image(image)
if flavor and isinstance(flavor, dict):
kwargs['flavor'] = flavor
kwargs['flavor'] = flavor['id']
else:
kwargs['flavor'] = self.get_flavor(flavor, get_extra=False)

15
shade/tests/functional/test_compute.py
View File

@ -70,6 +70,21 @@ class TestCompute(base.BaseFunctionalTestCase):
self.demo_cloud.delete_server(self.server_name, wait=True))
self.assertIsNone(self.demo_cloud.get_server(self.server_name))
def test_create_server_image_flavor_dict(self):
self.addCleanup(self._cleanup_servers_and_volumes, self.server_name)
server = self.demo_cloud.create_server(
name=self.server_name,
image={'id': self.image.id},
flavor={'id': self.flavor.id},
wait=True)
self.assertEqual(self.server_name, server['name'])
self.assertEqual(self.image.id, server['image']['id'])
self.assertEqual(self.flavor.id, server['flavor']['id'])
self.assertIsNotNone(server['adminPass'])
self.assertTrue(
self.demo_cloud.delete_server(self.server_name, wait=True))
self.assertIsNone(self.demo_cloud.get_server(self.server_name))
def test_get_server_console(self):
self.addCleanup(self._cleanup_servers_and_volumes, self.server_name)
server = self.demo_cloud.create_server(