fix import

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

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index def366f..19a91e8 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -17,8 +17,8 @@ from sfa.rspecs.elements.disk_image import DiskImage
 from sfa.rspecs.elements.services import Services
 from sfa.rspecs.elements.interface import Interface
 from sfa.util.xrn import Xrn
-from sfa.util.plxrn import PlXrn, hrn_to_pl_slicename
-from sfa.util.osxrn import OSXrn
+from sfa.planetlab.plxrn import PlXrn 
+from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename
 from sfa.rspecs.version_manager import VersionManager
 from sfa.openstack.image import ImageManager
 from sfa.openstack.security_group import SecurityGroup
@@ -88,12 +88,13 @@ class OSAggregate:
             zones = ['cloud']
         else:
             zones = [zone.name for zone in zones]
+        return zones
 
     def get_slice_nodes(self, slice_xrn):
         image_manager = ImageManager(self.driver)
 
         zones = self.get_availability_zones()
-        name = hrn_to_pl_slicename(slice_xrn)
+        name = hrn_to_os_slicename(slice_xrn)
         instances = self.driver.shell.db.instance_get_all_by_project(name)
         rspec_nodes = []
         for instance in instances:
@@ -177,7 +178,7 @@ class OSAggregate:
             username = Xrn(user['urn']).get_leaf()
             try:
                 self.driver.shell.auth_manager.get_user(username)
-            except nova.exception.UserNotFound:
+            except UserNotFound:
                 self.driver.shell.auth_manager.create_user(username)
             self.verify_user_keys(username, user['keys'], options)