From 7817983461c1126c7af15eb2733adbb56a6f344a Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 30 Nov 2014 20:51:31 -0500 Subject: [PATCH] Controller replaces Deployment --- planetstack/core/models/sliver.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py index 856e624..e931e9d 100644 --- a/planetstack/core/models/sliver.py +++ b/planetstack/core/models/sliver.py @@ -16,13 +16,13 @@ from planetstack.config import Config config = Config() -def get_default_flavor(deployment = None): +def get_default_flavor(controller = None): # Find a default flavor that can be used for a sliver. This is particularly # useful in evolution. It's also intended this helper function can be used # for admin.py when users - if deployment: - flavors = deployment.flavors.all() + if controller: + flavors = controller.flavors.all() else: flavors = Flavor.objects.all() @@ -87,7 +87,7 @@ class Sliver(PlCoreBase): 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') - deploymentNetwork = models.ForeignKey(Deployment, verbose_name='deployment', related_name='sliver_deploymentNetwork') + controllerNetwork = models.ForeignKey(Deployment, 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) @@ -107,11 +107,11 @@ class Sliver(PlCoreBase): self.name = self.slice.slicename if not self.creator and hasattr(self, 'caller'): self.creator = self.caller - self.deploymentNetwork = self.node.deployment + self.controllerNetwork = self.node.controller # XXX smbaker - disabled for now, was causing fault in tenant view create slice -# if not self.deploymentNetwork.test_acl(slice=self.slice): -# raise exceptions.ValidationError("Deployment %s's ACL does not allow any of this slice %s's users" % (self.deploymentNetwork.name, self.slice.name)) +# if not self.controllerNetwork.test_acl(slice=self.slice): +# raise exceptions.ValidationError("Deployment %s's ACL does not allow any of this slice %s's users" % (self.controllerNetwork.name, self.slice.name)) super(Sliver, self).save(*args, **kwds) -- 2.43.0