describe should return an empty rspec instead of an error if there are not allocated...

[sfa.git] / sfa / openstack / nova_driver.py

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 7666093..91de48b 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -395,7 +395,8 @@ class NovaDriver(Driver):
         return True
 
     def renew (self, urns, expiration_time, options={}):
-        return True
+        description = self.describe(urns, None, options)
+        return description['geni_slivers']
 
     def perform_operational_action  (self, urns, action, options={}):
         aggregate = OSAggregate(self)
@@ -408,14 +409,23 @@ class NovaDriver(Driver):
             action_method = aggreate.restart_instances
         else:
             raise UnsupportedOperation(action)
-        for urn in urns:
-            xrn = OSXrn(urn=urn)
-            tenant_name = xrn.get_tenant_name()
-            project_name = xrn.get_slicename()
-            id = xrn.id
-            aggreate.action_method(tenant_name, project_name, id)
+
+         # fault if sliver is not full allocated (operational status is geni_pending_allocation)
+        description = self.describe(urns, None, options)
+        for sliver in description['geni_slivers']:
+            if sliver['geni_operational_status'] == 'geni_pending_allocation':
+                raise UnsupportedOperation(action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)")
+        #
+        # Perform Operational Action Here
+        #
+
+        instances = aggregate.get_instances(urns) 
+        for instance in instances:
+            tenant_name = self.driver.shell.auth_manager.client.tenant_name
+            action_method(tenant_name, instance.name, instance.id)
         description = self.describe(urns)
-        return description['geni_slivers']      
+        geni_slivers = self.describe(urns, None, options)['geni_slivers']
+        return geni_slivers
 
     def shutdown(self, xrn, options={}):
         xrn = OSXrn(xrn=xrn, type='slice')