fix Status() return value
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 5 Dec 2012 15:47:32 +0000 (10:47 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 5 Dec 2012 15:47:32 +0000 (10:47 -0500)
sfa/openstack/nova_driver.py
sfa/planetlab/pldriver.py

index ec4b1f9..7666093 100644 (file)
@@ -332,7 +332,9 @@ class NovaDriver(Driver):
     def status (self, urns, options={}):
         aggregate = OSAggregate(self)
         desc =  aggregate.describe(urns)
-        return desc['geni_slivers']
+        status = {'geni_urn': desc['geni_urn'],
+                  'geni_slivers': desc['geni_slivers']}
+        return status
 
     def allocate (self, urn, rspec_string, options={}):
         xrn = Xrn(urn) 
index 5359473..d2dee28 100644 (file)
@@ -576,7 +576,9 @@ class PlDriver (Driver):
     def status (self, urns, options={}):
         aggregate = PlAggregate(self)
         desc =  aggregate.describe(urns)
-        return desc['geni_slivers']
+        status = {'geni_urn': desc['geni_urn'],
+                  'geni_slivers': desc['geni_slivers']}
+        return status
 
     def allocate (self, urn, rspec_string, options={}):
         xrn = Xrn(urn)