Merge branch 'master' into senslab2

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

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 1d39b44..46e1e0f 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -3,6 +3,7 @@ import datetime
 #
 from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \
     RecordNotFound, SfaNotImplemented, SliverDoesNotExist
+
 from sfa.util.sfalogging import logger
 from sfa.util.defaultdict import defaultdict
 from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
@@ -10,8 +11,10 @@ from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id
 from sfa.util.cache import Cache
 # used to be used in get_ticket
 #from sfa.trust.sfaticket import SfaTicket
+
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
+
 # the driver interface, mostly provides default behaviours
 from sfa.managers.driver import Driver
 from sfa.openstack.nova_shell import NovaShell
@@ -99,11 +102,11 @@ class NovaDriver (Driver):
         type=sfa_record['type']
         name = Xrn(sfa_record['hrn']).get_leaf()     
         if type == 'user':
-            if self.shell.user_get(name):
-                self.shell.user_delete(name)
+            if self.shell.auth_manager.get_user(name):
+                self.shell.auth_manager.delete_user(name)
         elif type == 'slice':
-            if self.shell.project_get(name):
-                self.shell.project_delete(name)
+            if self.shell.auth_manager.get_project(name):
+                self.shell.auth_manager.delete_project(name)
         return True