Move _deferred_server_statuses to nova_utils

Refactoring as part of blueprint native-nova-instance.

Change-Id: I91234905a2647ed03fd105b0fe5964ce2319248b

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 8e861e7e0dec92a984ca0fb6a06f555365cfc83a..6946a60de22be23fa73795f2a4b2e5a9ddfb094f 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -138,17 +138,6 @@ class Instance(resource.Resource):
     update_allowed_keys = ('Metadata', 'Properties')
     update_allowed_properties = ('InstanceType',)
 
-    _deferred_server_statuses = ['BUILD',
-                                 'HARD_REBOOT',
-                                 'PASSWORD',
-                                 'REBOOT',
-                                 'RESCUE',
-                                 'RESIZE',
-                                 'REVERT_RESIZE',
-                                 'SHUTOFF',
-                                 'SUSPENDED',
-                                 'VERIFY_RESIZE']
-
     def __init__(self, name, json_snippet, stack):
         super(Instance, self).__init__(name, json_snippet, stack)
         self.ipaddress = None
@@ -316,7 +305,7 @@ class Instance(resource.Resource):
 
             # Some clouds append extra (STATUS) strings to the status
             short_server_status = server.status.split('(')[0]
-            if short_server_status in self._deferred_server_statuses:
+            if short_server_status in nova_utils.deferred_server_statuses:
                 return False
             elif server.status == 'ACTIVE':
                 self._set_ipaddress(server.networks)
@@ -485,7 +474,7 @@ class Instance(resource.Resource):
                 server.get()
                 logger.debug("%s check_suspend_complete status = %s" %
                              (self.name, server.status))
-                if server.status in list(self._deferred_server_statuses +
+                if server.status in list(nova_utils.deferred_server_statuses +
                                          ['ACTIVE']):
                     return server.status == 'SUSPENDED'
                 else:

diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/resources/nova_utils.py
index a2a6975228e46968507b347e10dc8503c1380ef6..05969ebb1bb6e85254920428efd3aae25778c0a6 100644 (file)
--- a/heat/engine/resources/nova_utils.py
+++ b/heat/engine/resources/nova_utils.py
@@ -33,6 +33,18 @@ from heat.openstack.common import uuidutils
 logger = logging.getLogger(__name__)
 
 
+deferred_server_statuses = ['BUILD',
+                            'HARD_REBOOT',
+                            'PASSWORD',
+                            'REBOOT',
+                            'RESCUE',
+                            'RESIZE',
+                            'REVERT_RESIZE',
+                            'SHUTOFF',
+                            'SUSPENDED',
+                            'VERIFY_RESIZE']
+
+
 def get_image_id(nova_client, image_identifier):
     '''
     Return an id for the specified image name or identifier.