X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack%2Fmanager.py;fp=plstackapi%2Fopenstack%2Fmanager.py;h=788a621f9cb86736342023fea7102af8eb4b94a2;hb=30fd4291ad7fdb809bb8ebbf738c3195436c2455;hp=c55e752ed61dfd20ee38a5d217924526ad6e73dd;hpb=ed163d7e298e629f18131bde592fac6ae68ebc09;p=plstackapi.git

diff --git a/plstackapi/openstack/manager.py b/planetstack/openstack/manager.py
similarity index 91%
rename from plstackapi/openstack/manager.py
rename to planetstack/openstack/manager.py
index c55e752..788a621 100644
--- a/plstackapi/openstack/manager.py
+++ b/planetstack/openstack/manager.py
@@ -1,16 +1,20 @@
-from plstackapi.planetstack import settings
-from django.core import management
-management.setup_environ(settings)
+from planetstack import settings
+#from django.core import management
+#management.setup_environ(settings)
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+
 try:
-    from plstackapi.openstack.client import OpenStackClient
-    from plstackapi.openstack.driver import OpenStackDriver
-    from plstackapi.planetstack.config import Config
-    from plstackapi.core.models import * 
+    from openstack.client import OpenStackClient
+    from openstack.driver import OpenStackDriver
+    from planetstack.config import Config
+    from core.models import * 
     has_openstack = True
 except:
-    has_openpstack = False
+    has_openstack = False
 
-manager_enabled = Config().api_nova_enabled
+#manager_enabled = Config().api_nova_enabled
+manager_enabled = False
 
 def require_enabled(callable):
     def wrapper(*args, **kwds):
@@ -34,7 +38,7 @@ class OpenStackManager:
         self.caller=caller
         if not self.caller:
             self.caller = self.driver.admin_user
-            self.caller.user_id = self.caller.id 
+            self.caller.kuser_id = self.caller.id 
 
     @require_enabled
     def save_role(self, role):
@@ -62,19 +66,19 @@ class OpenStackManager:
 
     @require_enabled
     def save_user(self, user):
-        if not user.user_id:
+        if not user.kuser_id:
             name = user.email[:user.email.find('@')]
             user_fields = {'name': name,
                            'email': user.email,
                            'password': user.password,
                            'enabled': True}
             keystone_user = self.driver.create_user(**user_fields)
-            user.user_id = keystone_user.id
+            user.kuser_id = keystone_user.id
     
     @require_enabled
     def delete_user(self, user):
-        if user.user_id:
-            self.driver.delete_user(user.user_id)        
+        if user.kuser_id:
+            self.driver.delete_user(user.kuser_id)        
     
 
     
@@ -86,7 +90,7 @@ class OpenStackManager:
                                                enabled=site.enabled)
             site.tenant_id = tenant.id
             # give caller an admin role at the tenant they've created
-            self.driver.add_user_role(self.caller.user_id, tenant.id, 'admin')
+            self.driver.add_user_role(self.caller.kuser_id, tenant.id, 'admin')
 
         # update the record
         if site.id and site.tenant_id:
@@ -109,7 +113,7 @@ class OpenStackManager:
             slice.tenant_id = tenant.id
 
             # give caller an admin role at the tenant they've created
-            self.driver.add_user_role(self.caller.user_id, tenant.id, 'admin')
+            self.driver.add_user_role(self.caller.kuser_id, tenant.id, 'admin')
 
             # refresh credentials using this tenant
             self.driver.shell.connect(username=self.driver.shell.keystone.username,