Fix bugs

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

diff --git a/plstackapi/core/models/site.py b/plstackapi/core/models/site.py
index 5ec04c4..b15e35b 100644 (file)
--- a/plstackapi/core/models/site.py
+++ b/plstackapi/core/models/site.py
@@ -3,10 +3,6 @@ from django.db import models
 from plstackapi.core.models import PlCoreBase
 from plstackapi.core.models import DeploymentNetwork
 
-from plstackapi.openstack.driver import OpenStackDriver
-
-# Create your models here.
-
 
 class Site(PlCoreBase):
 
@@ -24,26 +20,41 @@ class Site(PlCoreBase):
 
     def __unicode__(self):  return u'%s' % (self.name)
 
+    def save(self, *args, **kwds):
+        if not self.tenant_id:
+            tenant = self.driver.create_tenant(tenant_name=self.login_base, 
+                                               description=self.name, 
+                                               enabled=self.enabled)
+            self.tenant_id = tenant.id
+        # update the record
+        if self.id:
+            self.driver.update_tenant(self.tenant_id, 
+                                      description=self.name,
+                                      enabled=self.enabled)
+
+        super(Site, self).save(*args, **kwds)               
+
+
+    def delete(self, *args, **kwds):
+        if self.tenant_id:
+            self.driver.delete_tenant(self.tenant_id)
+        super(Site, self).delete(*args, **kwds)         
+        
+
 class SitePrivilege(PlCoreBase):
 
-    user = models.ForeignKey('User', related_name='site_privileges')
+    user = models.ForeignKey('PLUser', related_name='site_privileges')
     site = models.ForeignKey('Site', related_name='site_privileges')
     role = models.ForeignKey('Role')
 
     def __unicode__(self):  return u'%s %s %s' % (self.site, self.user, self.role)
 
     def save(self, *args, **kwds):
-        driver  = OpenStackDriver()
-        driver.add_user_role(user_id=user.user_id,
-                             tenant_id=site.tenant_id,
-                             role_name=role.name)
+        self.driver.add_user_role(self.user.user_id, self.site.tenant_id, self.role.role_type)
         super(SitePrivilege, self).save(*args, **kwds)
 
     def delete(self, *args, **kwds):
-        driver = OpenStackDriver()
-        driver.delete_user_role(user_id=user.user_id,
-                                tenant_id=site.tenant_id,
-                                role_name=role.name)
+        self.driver.delete_user_role(self.user.user_id, self.site.tenant_id, self.role.role_type)
         super(SitePrivilege, self).delete(*args, **kwds)