From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 3 Aug 2012 02:05:49 +0000 (-0400)
Subject: fix list_slices
X-Git-Tag: sfa-2.1-14~71
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b8843890f35056ab7fe42b0765cb3e0ac114c3cf;p=sfa.git

fix list_slices
---

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index ee254916..e4ef9610 100644
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -339,15 +339,18 @@ class NovaDriver(Driver):
                 return slices
     
         # get data from db
-        projs = self.shell.auth_manager.get_projects()
-        slice_urns = [OSXrn(proj.name, 'slice').urn for proj in projs] 
-    
+        instance_urns = []
+        instances = self.shell.nova_manager.servers.findall()
+        for instance in instances:
+            if instance.name not in instance_urns:
+                instance_urns.append(OSXrn(instance.name, type='slice').urn)
+
         # cache the result
         if self.cache:
             logger.debug ("OpenStackDriver.list_slices stores value in cache")
-            self.cache.add('slices', slice_urns) 
+            self.cache.add('slices', instance_urns) 
     
-        return slice_urns
+        return instance_urns
         
     # first 2 args are None in case of resource discovery
     def list_resources (self, slice_urn, slice_hrn, creds, options):