Fixed a naming issue s/SliceDeploymentss/ss/s

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

diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 7412fe2..2188c29 100644 (file)
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -92,7 +92,15 @@ class Slice(PlCoreBase):
         from core.models.network import Network
         nets = Network.objects.filter(slices=self)
         nets.delete() 
+        # delete slice deployments
+        slice_deployments = SliceDeployments.objects.filter(slice=self)
+        slice_deployments.delete()
+        # delete slice privilege
+        slice_privileges = SlicePrivilege.objects.filter(slice=self)
+        slice_privileges.delete() 
+        # continue with normal delete
         super(SliceAdmin, self).delete(*args, **kwds) 
+         
 
 class SliceRole(PlCoreBase):
     ROLE_CHOICES = (('admin','Admin'),('default','Default'))
@@ -102,9 +110,9 @@ class SliceRole(PlCoreBase):
     def __unicode__(self):  return u'%s' % (self.role)
 
 class SlicePrivilege(PlCoreBase):
-    user = models.ForeignKey('User', related_name='slice_privileges')
-    slice = models.ForeignKey('Slice', related_name='slice_privileges')
-    role = models.ForeignKey('SliceRole')
+    user = models.ForeignKey('User', related_name='sliceprivileges')
+    slice = models.ForeignKey('Slice', related_name='sliceprivileges')
+    role = models.ForeignKey('SliceRole',related_name='sliceprivileges')
 
     def __unicode__(self):  return u'%s %s %s' % (self.slice, self.user, self.role)
 
@@ -124,8 +132,8 @@ class SliceDeployments(PlCoreBase):
     objects = DeploymentLinkManager()
     deleted_objects = DeploymentLinkDeletionManager()
 
-    slice = models.ForeignKey(Slice)
-    deployment = models.ForeignKey(Deployment)
+    slice = models.ForeignKey(Slice, related_name='slicedeployments')
+    deployment = models.ForeignKey(Deployment, related_name='slicedeployments')
     tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")
     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")