fix field description

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

diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 2fd9fd3..3d18b24 100644 (file)
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -4,8 +4,11 @@ from core.models import PlCoreBase
 from core.models import Site
 from core.models import User
 from core.models import Role
-from core.models import DeploymentNetwork
-from openstack.manager import OpenStackManager
+from core.models import Deployment
+from core.models import ServiceClass
+from core.models import Tag
+from django.contrib.contenttypes import generic
+from core.models import Service
 
 # Create your models here.
 
@@ -16,46 +19,40 @@ class Slice(PlCoreBase):
     omf_friendly = models.BooleanField()
     description=models.TextField(blank=True,help_text="High level description of the slice and expected activities", max_length=1024)
     slice_url = models.URLField(blank=True, max_length=512)
-    site = models.ForeignKey(Site, related_name='slices', help_text="The Site this Node belongs too")
+    site = models.ForeignKey(Site, related_name='slices', help_text="The Site this Slice belongs to")
     network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
     router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")
     subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id")
+    service = models.ForeignKey(Service, related_name='service', null=True, blank=True)
 
-    SVC_CLASS_CHOICES = (('besteffort', 'Best Effort'), ('silver', 'Silver'), ('gold','Gold'))
-    serviceClass = models.CharField(verbose_name="Service Class",default="besteffort",help_text="The Service Class of this slice", max_length=30, choices=SVC_CLASS_CHOICES)
+    tags = generic.GenericRelation(Tag)
 
+    serviceClass = models.ForeignKey(ServiceClass, related_name = "slices", null=True, default=ServiceClass.get_default)
+    creator = models.ForeignKey(User, related_name='slices', blank=True, null=True)
 
     def __unicode__(self):  return u'%s' % (self.name)
 
     def save(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            setattr(self, 'os_manager', OpenStackManager())
-            self.os_manager.save_slice(self)
+        if self.serviceClass is None:
+            # We allowed None=True for serviceClass because Django evolution
+            # will fail unless it is allowed. But, we we really don't want it to
+            # ever save None, so fix it up here.
+            self.serviceClass = ServiceClass.get_default()
+        if not self.creator and hasattr(self, 'caller'):
+            self.creator = self.caller
         super(Slice, self).save(*args, **kwds)
 
-    def delete(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            setattr(self, 'os_manager', OpenStackManager())
-            self.os_manager.delete_slice(self)
-        super(Slice, self).delete(*args, **kwds)    
+class SliceRole(PlCoreBase):
+    ROLE_CHOICES = (('admin','Admin'),('default','Default'), ('user', 'User'), ('pi', 'PI'))
 
-class SliceMembership(PlCoreBase):
-    user = models.ForeignKey('User', related_name='slice_memberships')
-    slice = models.ForeignKey('Slice', related_name='slice_memberships')
-    role = models.ForeignKey('Role')
+    role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30)
+    krole_id = models.CharField(max_length=80, verbose_name="Keystone role id", null=True, blank=True)
 
-    def __unicode__(self):  return u'%s %s %s' % (self.slice, self.user, self.role)
+    def __unicode__(self):  return u'%s' % (self.role)
 
-    def save(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            setattr(self, 'os_manager', OpenStackManager())
-            if self.os_manager.driver:
-                self.os_manager.driver.add_user_role(self.user.kuser_id, self.slice.tenant_id, self.role.role_type)
-        super(SliceMembership, self).save(*args, **kwds)
-
-    def delete(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            setattr(self, 'os_manager', OpenStackManager())
-            if self.os_manager.driver:
-                self.os_manager.driver.delete_user_role(self.user.kuser_id, self.slice.tenant_id, self.role.role_type)
-        super(SliceMembership, self).delete(*args, **kwds)
+class SlicePrivilege(PlCoreBase):
+    user = models.ForeignKey('User', related_name='slice_privileges')
+    slice = models.ForeignKey('Slice', related_name='slice_privileges')
+    role = models.ForeignKey('SliceRole')
+
+    def __unicode__(self):  return u'%s %s %s' % (self.slice, self.user, self.role)