refresh openstack credentials when creating a slice's network and router

[plstackapi.git] / plstackapi / core / models / slice.py

diff --git a/plstackapi/core/models/slice.py b/plstackapi/core/models/slice.py
index 27184dc..5a5f165 100644 (file)
--- a/plstackapi/core/models/slice.py
+++ b/plstackapi/core/models/slice.py
@@ -5,7 +5,6 @@ from plstackapi.core.models import Site
 from plstackapi.core.models import PLUser
 from plstackapi.core.models import Role
 from plstackapi.core.models import DeploymentNetwork
-from plstackapi.openstack.driver import OpenStackDriver
 
 # Create your models here.
 
@@ -25,31 +24,41 @@ class Slice(PlCoreBase):
     def __unicode__(self):  return u'%s' % (self.name)
 
     def save(self, *args, **kwds):
-
-        driver = OpenStackDriver()
         if not self.tenant_id:
             nova_fields = {'tenant_name': self.name,
                    'description': self.description,
                    'enabled': self.enabled}
-            tenant = driver.create_tenant(**nova_fields)
+            tenant = self.driver.create_tenant(**nova_fields)
             self.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')
+
+            # refresh credentials using this tenant
+            self.driver.shell.connect(username=self.driver.shell.keystone.username,
+                                      password=self.driver.shell.keystone.password, 
+                                      tenant=tenant.name) 
+
             # create network
-            network = driver.create_network(self.name)
+            network = self.driver.create_network(self.name)
             self.network_id = network['id']
 
             # create router
-            router = driver.create_router(self.name)
+            router = self.driver.create_router(self.name)
             self.router_id = router['id']
 
+        if self.id:
+            self.driver.update_tenant(self.tenant_id,
+                                      description=self.description,
+                                      enabled=self.enabled)
+
         super(Slice, self).save(*args, **kwds)
 
     def delete(self, *args, **kwds):
-        driver = OpenStackDriver()
         if self.tenant_id:
-            driver.delete_router(self.router_id)
-            driver.delete_network(self.network_id)
-            driver.delete_tenant(self.tenant_id)
+            self.driver.delete_router(self.router_id)
+            self.driver.delete_network(self.network_id)
+            self.driver.delete_tenant(self.tenant_id)
 
         super(Slice, self).delete(*args, **kwds)    
 
@@ -60,3 +69,10 @@ class SliceMembership(PlCoreBase):
 
     def __unicode__(self):  return u'%s %s %s' % (self.slice, self.user, self.role)
 
+    def save(self, *args, **kwds):
+        self.driver.add_user_role(self.user.user_id, self.slice.tenant_id, self.role.role_type)
+        super(SliceMembership, self).save(*args, **kwds)
+
+    def delete(self, *args, **kwds):
+        self.driver.delete_user_role(self.user.user_id, self.slice.tenant_id, self.role.role_type)
+        super(SliceMembership, self).delete(*args, **kwds)