Fix up image and flavor by name in create_server

Nodepool has a problem with passing in {'id': image.id} which is what
the stated workaround for excess API calls is. Fix the call, and add a
functional test that should catch this.

Change-Id: I4938037decf51001ab5789ee383f6c7ed34889b1

shade/openstackcloud.py

@@ -4520,11 +4520,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)
 

shade/tests/functional/test_compute.py

@@ -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(