X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fsliver.py;h=de0ff849164b4be6fe7c7895d6d8effb90248c4c;hb=1564bf53d70e91612f8bd587a01a75e0dada5917;hp=059b5c07ce355649d8428d7334bc22c213a6f09e;hpb=0a3910a717644b4c45f41212ff2e0cfb6a63cfac;p=plstackapi.git diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py index 059b5c0..de0ff84 100644 --- a/planetstack/core/models/sliver.py +++ b/planetstack/core/models/sliver.py @@ -88,8 +88,8 @@ class Sliver(PlCoreBase): #key = models.ForeignKey(Key, related_name='slivers') creator = models.ForeignKey(User, related_name='slivers', blank=True, null=True) slice = models.ForeignKey(Slice, related_name='slivers') + deployment = models.ForeignKey(Deployment, verbose_name='deployment', related_name='sliver_deployment') node = models.ForeignKey(Node, related_name='slivers') - 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) @@ -109,7 +109,6 @@ class Sliver(PlCoreBase): self.name = self.slice.slicename if not self.creator and hasattr(self, 'caller'): self.creator = self.caller - self.controllerNetwork = self.node.site_deployment.controller # XXX smbaker - disabled for now, was causing fault in tenant view create slice # if not self.controllerNetwork.test_acl(slice=self.slice):