Renamed inst.terminate() to delete() and InstanceState to DELETED

cloudbridge/cloud/base/resources.py

@@ -403,7 +403,7 @@ class BaseInstance(BaseCloudResource, BaseObjectLifeCycleMixin, Instance):
     def wait_till_ready(self, timeout=None, interval=None):
         self.wait_for(
             [InstanceState.RUNNING],
-            terminal_states=[InstanceState.TERMINATED, InstanceState.ERROR],
+            terminal_states=[InstanceState.DELETED, InstanceState.ERROR],
             timeout=timeout,
             interval=interval)
 

cloudbridge/cloud/interfaces/resources.py

@@ -210,7 +210,7 @@ class ObjectLifeCycleMixin(object):
         .. code-block:: python
 
             instance.wait_for(
-                [InstanceState.TERMINATED, InstanceState.UNKNOWN],
+                [InstanceState.DELETED, InstanceState.UNKNOWN],
                 terminal_states=[InstanceState.ERROR])
 
         :type target_states: ``list`` of states
@@ -421,7 +421,7 @@ class InstanceState(object):
     :cvar CONFIGURING: Instance is being reconfigured in some way.
     :cvar RUNNING: Instance is running.
     :cvar REBOOTING: Instance is rebooting.
-    :cvar TERMINATED: Instance is terminated. No further operations possible.
+    :cvar DELETED: Instance is deleted. No further operations possible.
     :cvar STOPPED: Instance is stopped. Instance can be resumed.
     :cvar ERROR: Instance is in an error state. No further operations possible.
 
@@ -431,7 +431,7 @@ class InstanceState(object):
     CONFIGURING = "configuring"
     RUNNING = "running"
     REBOOTING = "rebooting"
-    TERMINATED = "terminated"
+    DELETED = "deleted"
     STOPPED = "stopped"
     ERROR = "error"
 
@@ -502,9 +502,9 @@ class Instance(ObjectLifeCycleMixin, CloudResource):
         pass
 
     @abstractmethod
-    def terminate(self):
+    def delete(self):
         """
-        Permanently terminate this instance.
+        Permanently delete this instance.
         """
         pass
 

cloudbridge/cloud/providers/aws/resources.py

@@ -197,7 +197,7 @@ class AWSInstance(BaseInstance):
         'pending': InstanceState.PENDING,
         'running': InstanceState.RUNNING,
         'shutting-down': InstanceState.CONFIGURING,
-        'terminated': InstanceState.TERMINATED,
+        'terminated': InstanceState.DELETED,
         'stopping': InstanceState.CONFIGURING,
         'stopped': InstanceState.STOPPED
     }
@@ -243,7 +243,7 @@ class AWSInstance(BaseInstance):
     def reboot(self):
         self._ec2_instance.reboot()
 
-    def terminate(self):
+    def delete(self):
         self._ec2_instance.terminate()
 
     @property

cloudbridge/cloud/providers/openstack/resources.py

@@ -227,7 +227,7 @@ class OpenStackInstance(BaseInstance):
     INSTANCE_STATE_MAP = {
         'ACTIVE': InstanceState.RUNNING,
         'BUILD': InstanceState.PENDING,
-        'DELETED': InstanceState.TERMINATED,
+        'DELETED': InstanceState.DELETED,
         'ERROR': InstanceState.ERROR,
         'HARD_REBOOT': InstanceState.REBOOTING,
         'PASSWORD': InstanceState.PENDING,

test/helpers/__init__.py

@@ -154,8 +154,8 @@ def get_test_fixtures_folder():
 
 def delete_test_instance(instance):
     if instance:
-        instance.terminate()
-        instance.wait_for([InstanceState.TERMINATED, InstanceState.UNKNOWN],
+        instance.delete()
+        instance.wait_for([InstanceState.DELETED, InstanceState.UNKNOWN],
                           terminal_states=[InstanceState.ERROR])
 
 

test/test_compute_service.py

@@ -30,15 +30,15 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                                              subnet=subnet)
 
         def cleanup_inst(inst):
-            inst.terminate()
-            inst.wait_for([InstanceState.TERMINATED, InstanceState.UNKNOWN])
+            inst.delete()
+            inst.wait_for([InstanceState.DELETED, InstanceState.UNKNOWN])
 
         def check_deleted(inst):
             deleted_inst = self.provider.compute.instances.get(
                 inst.id)
             self.assertTrue(
                 deleted_inst is None or deleted_inst.state in (
-                    InstanceState.TERMINATED,
+                    InstanceState.DELETED,
                     InstanceState.UNKNOWN),
                 "Instance %s should have been deleted but still exists." %
                 name)