Provision requires the geni_rspec_version option

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

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index b6595b2..c3c9f54 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -374,8 +374,9 @@ class NovaDriver(Driver):
             sliver_hrn = "%s.%s" % (self.driver.hrn, instance.id)
             sliver_ids.append(Xrn(sliver_hrn, type='sliver').urn)
         SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned') 
-            
-        return self.describe(urns, options=options) 
+        version_manager = VersionManager()
+        rspec_version = version_manager.get_version(options['geni_rspec_version'])
+        return self.describe(urns, rspec_version, options=options) 
 
     def delete (self, urns, options={}):
         # collect sliver ids so we can update sliver allocation states after
@@ -392,10 +393,19 @@ class NovaDriver(Driver):
             
         # delete sliver allocation states
         SliverAllocation.delete_allocations(sliver_ids)
-        return True
+
+        # return geni_slivers
+        geni_slivers = []
+        for sliver_id in sliver_ids:
+            geni_slivers.append(
+                {'geni_sliver_urn': sliver['sliver_id'],
+                 'geni_allocation_status': 'geni_unallocated',
+                 'geni_expires': None})        
+        return geni_slivers
 
     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)