X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fslice.py;h=7915d42b1cc8f38645bb1d5f5b13ffdb76efb436;hb=f4f3125671f62da61199155fc1ff72c53d86ef99;hp=1023856de55f8fae4354bac4f6a1aadca5f43849;hpb=00d1118d3202b9d8837d7cad16911af8eeaf93a0;p=plstackapi.git diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py index 1023856..7915d42 100644 --- a/planetstack/core/models/slice.py +++ b/planetstack/core/models/slice.py @@ -5,7 +5,7 @@ from core.models import Site from core.models.site import SitePrivilege from core.models import User from core.models import Role -from core.models import Deployment +from core.models import Deployment,DeploymentLinkManager,DeploymentLinkDeletionManager from core.models import ServiceClass from core.models.serviceclass import get_default_serviceclass from core.models import Tag @@ -42,7 +42,8 @@ class Slice(PlCoreBase): def save(self, *args, **kwds): site = Site.objects.get(id=self.site.id) - if not self.name.startswith(site.login_base): + # allow preexisting slices to keep their original name for now + if not self.id and not self.name.startswith(site.login_base): raise ValidationError('slice name must begin with %s' % site.login_base) if self.serviceClass is None: @@ -113,6 +114,9 @@ class SlicePrivilege(PlCoreBase): return qs class SliceDeployments(PlCoreBase): + objects = DeploymentLinkManager() + deleted_objects = DeploymentLinkDeletionManager() + slice = models.ForeignKey(Slice) deployment = models.ForeignKey(Deployment) tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id")