From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 7 Aug 2012 14:33:47 +0000 (-0400)
Subject: Added geni_allocation_status to SliverStatus return
X-Git-Tag: sfa-3.0-0~151
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e653bfd89511941e55d85657816859f9ffbc804b;hp=33c77f0907d42cfb0d0b5a046489b77aa8bfcae1;p=sfa.git

Added geni_allocation_status to SliverStatus return
---

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index b023ba49..2f2fc2a9 100644
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -397,9 +397,6 @@ class NovaDriver(Driver):
             raise SliverDoesNotExist("You have not allocated any slivers here") 
         
         result = {}
-        top_level_status = 'unknown'
-        if instances:
-            top_level_status = 'ready'
         result['geni_urn'] = slice_urn
         result['plos_login'] = 'root'
         # do we need real dates here? 
@@ -426,9 +423,9 @@ class NovaDriver(Driver):
             else:
                 res['boot_state'] = 'unknown'  
                 res['geni_status'] = 'unknown'
+            res['geni_allocation_status'] = 'geni_provisioned'
             resources.append(res)
             
-        result['geni_status'] = top_level_status
         result['geni_resources'] = resources
         return result
 
diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 2afcf8cf..88126810 100644
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -677,9 +677,6 @@ t of slivers in a given state
         site_ids = [node['site_id'] for node in nodes]
     
         result = {}
-        top_level_status = 'unknown'
-        if nodes:
-            top_level_status = 'ready'
         result['geni_urn'] = slice_urn
         result['pl_login'] = slice['name']
         result['pl_expires'] = datetime_to_string(utcparse(slice['expires']))
@@ -701,14 +698,12 @@ t of slivers in a given state
                 res['geni_status'] = 'ready'
             else:
                 res['geni_status'] = 'failed'
-                top_level_status = 'failed' 
+            res['geni_allocation_status'] = 'geni_provisioned'
                 
             res['geni_error'] = ''
             res['users'] = [user]  
-    
             resources.append(res)
             
-        result['geni_status'] = top_level_status
         result['geni_resources'] = resources
         return result