Merge "functional: Remove 'get_invalid_image'"

Author: Zuul

nova/tests/functional/integrated_helpers.py

@@ -25,7 +25,6 @@
 
 import os_traits
 from oslo_log import log as logging
-from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import instance_actions
 from nova.compute import utils as compute_utils
@@ -317,9 +316,6 @@ def get_unused_flavor_name_id(self):
         return (generate_new_element(flavor_names, 'flavor'),
                 int(generate_new_element(flavor_ids, '', True)))
 
-    def get_invalid_image(self):
-        return uuids.fake
-
     def _build_minimal_create_server_request(self, name=None, image_uuid=None,
                                              flavor_id=None, networks=None,
                                              az=None, host=None):

nova/tests/functional/test_servers.py

@@ -266,7 +266,7 @@ def test_create_and_delete_server(self):
                           self.api.post_server, post)
 
         # With an invalid imageRef, this throws 500.
-        server[self._image_ref_parameter] = self.get_invalid_image()
+        server[self._image_ref_parameter] = uuids.fake
         # TODO(justinsb): Check whatever the spec says should be thrown here
         self.assertRaises(client.OpenStackApiException,
                           self.api.post_server, post)