commit 68a1e425692caffbfc54c0229b9abd2c5be315a2
author Tony Mack <tmack@tux.cs.princeton.edu> Mon Dec 08 16:43:02 2014 -0500
committer Sapan Bhatia <sapanb@cs.princeton.edu> Fri Dec 19 14:01:43 2014 -0500
tree c893d0987a562c49ee3e49fb7231e20e1e9662a6
parent d14d48f26d89055a14b2dc38fe3997c7b2c5c654

refactor and bug fixes

planetstack/core/models/__init__.py

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 08e6178..aa64676 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -5,7 +5,7 @@
 from .service import ServiceAttribute
 from .tag import Tag
 from .role import Role
-from .site import Site, Deployment, Controller, ControllerRole, ControllerPrivilege, SiteDeployments, ControllerSiteDeployments
+from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, SiteDeployments, ControllerSiteDeployments
 from .dashboard import DashboardView
 from .user import User, UserDashboardView
 from .serviceclass import ServiceClass

planetstack/core/models/site.py

diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index f0f372d..47f7baa 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -216,6 +216,44 @@
 
     def __unicode__(self):  return u'%s' % (self.name)
 
+class DeploymentRole(PlCoreBase):
+    #objects = DeploymentLinkManager()
+    #deleted_objects = DeploymentLinkDeletionManager()
+    ROLE_CHOICES = (('admin','Admin'),)
+    role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30)
+
+    def __unicode__(self):  return u'%s' % (self.role)
+
+class DeploymentPrivilege(PlCoreBase):
+    #objects = DeploymentLinkManager()
+    #deleted_objects = DeploymentLinkDeletionManager()
+
+    user = models.ForeignKey('User', related_name='deploymentprivileges')
+    deployment = models.ForeignKey('Deployment', related_name='deploymentprivileges')
+    role = models.ForeignKey('DeploymentRole',related_name='deploymentprivileges')
+
+    def __unicode__(self):  return u'%s %s %s' % (self.deployment, self.user, self.role)
+
+    def can_update(self, user):
+        if user.is_readonly:
+            return False
+        if user.is_admin:
+            return True
+        dprivs = DeploymentPrivilege.objects.filter(user=user)
+        for dpriv in dprivs:
+            if dpriv.role.role == 'admin':
+                return True
+        return False
+
+    @staticmethod
+    def select_by_user(user):
+        if user.is_admin:
+            qs = DeploymentPrivilege.objects.all()
+        else:
+            dpriv_ids = [dp.id for dp in DeploymentPrivilege.objects.filter(user=user)]
+            qs = DeploymentPrivilege.objects.filter(id__in=dpriv_ids)
+        return qs
+
 class ControllerRole(PlCoreBase):
     #objects = ControllerLinkManager()
     #deleted_objects = ControllerLinkDeletionManager()
@@ -276,7 +314,7 @@
 
     site = models.ForeignKey(Site,related_name='sitedeployments')
     deployment = models.ForeignKey(Deployment,related_name='sitedeployments')
-    controller = models.ForeignKey(Controller, relaed_name='sitedeployments')
+    controller = models.ForeignKey(Controller, null=True, blank=True, related_name='sitedeployments')
     availability_zone = models.CharField(max_length=200, null=True, blank=True, help_text="OpenStack availability zone")
 
     def __unicode__(self):  return u'%s %s' % (self.deployment, self.site)
@@ -286,7 +324,7 @@
     deleted_objects = ControllerLinkDeletionManager()
     
     controller = models.ForeignKey(Controller, related_name='controllersitedeployments')
-    site_deployment = models.ForeignKey(SiteDeployments, related _name='controllersitedeployments') 
+    site_deployment = models.ForeignKey(SiteDeployments, related_name='controllersitedeployments') 
     tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")
 
     def __unicode__(self):  return u'%s %s' % (self.controller, self.site_deployment)

planetstack/core/models/sliver.py

diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index c4449fe..750b656 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -8,6 +8,7 @@
 from core.models import Node
 from core.models import Site
 from core.models import Deployment
+from core.models import Controller
 from core.models import User
 from core.models import Tag
 from core.models import Flavor
@@ -88,7 +89,7 @@
     creator = models.ForeignKey(User, related_name='slivers', blank=True, null=True)
     slice = models.ForeignKey(Slice, related_name='slivers')
     node = models.ForeignKey(Node, related_name='slivers')
-    controllerNetwork = models.ForeignKey(Deployment, verbose_name='controller', related_name='sliver_controllerNetwork')
+    controllerNetwork = models.ForeignKey(Controller, verbose_name='controller', related_name='sliver_controllerNetwork')
     numberCores = models.IntegerField(verbose_name="Number of Cores", help_text="Number of cores for sliver", default=0)
     flavor = models.ForeignKey(Flavor, help_text="Flavor of this instance", default=get_default_flavor)
     tags = generic.GenericRelation(Tag)