From 41945e02476d03f7070776ca836d5e02cfc0416c Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 9 May 2013 19:25:10 -0400
Subject: [PATCH] refactor

---
 plstackapi/core/admin.py        |  1 -
 plstackapi/openstack/manager.py | 33 ++++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py
index 52ef20d..2365225 100644
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@ -380,7 +380,6 @@ admin.site.register(Site, SiteAdmin)
 admin.site.register(SitePrivilege, SitePrivilegeAdmin)
 admin.site.register(Slice, SliceAdmin)
 admin.site.register(SliceMembership, SliceMembershipAdmin)
-admin.site.register(Image, ImageAdmin)
 admin.site.register(Node, NodeAdmin)
 admin.site.register(Sliver, SliverAdmin)
 admin.site.register(Key, KeyAdmin)
diff --git a/plstackapi/openstack/manager.py b/plstackapi/openstack/manager.py
index b912934..669a05f 100644
--- a/plstackapi/openstack/manager.py
+++ b/plstackapi/openstack/manager.py
@@ -33,16 +33,31 @@ class OpenStackManager:
 
         if has_openstack and manager_enabled:
             if auth:
-                self.client = OpenStackClient(**auth)
+                try:
+                    self.init_user(auth, caller)
+                except:
+                    # if this fails then it meanse the caller doesn't have a
+                    # role at the slice's tenant. if the caller is an admin
+                    # just use the admin client/manager.
+                    if caller and caller.is_admin: 
+                        self.init_admin()
+                    else: raise
             else:
-                self.client = OpenStackClient()
-            self.driver = OpenStackDriver(client=self.client) 
-            
-            if caller:
-                self.caller = caller
-            else:
-                self.caller = self.driver.admin_user
-                self.caller.user_id = self.caller.id 
+                self.init_admin()
+
+    @require_enabled 
+    def init_user(self, auth, caller):
+        self.client = OpenStackClient(**auth)
+        self.driver = OpenStackDriver(client=self.client)
+        self.caller = caller                 
+    
+    @require_enabled
+    def init_admin(self):
+        # use the admin credentials 
+        self.client = OpenStackClient()
+        self.driver = OpenStackDriver(client=self.client)
+        self.caller = self.driver.admin_user
+        self.caller.user_id = self.caller.id 
 
     @require_enabled
     def save_role(self, role):
-- 
2.47.0