X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fsliver.py;h=4d89d9fac5479b20e4f3ac77621668dce1dc5e02;hb=bfb2b549ada86ce85fc0d87b1e00fdfc7ecb9fa4;hp=c4449fec81b9ad584aac06cfb48b65d9064a106b;hpb=67626f8405423db3fc2ff69c1d08776a5d92a082;p=plstackapi.git

diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index c4449fe..4d89d9f 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -8,6 +8,7 @@ from core.models import Slice
 from core.models import Node
 from core.models import Site
 from core.models import Deployment
+from core.models import Controller
 from core.models import User
 from core.models import Tag
 from core.models import Flavor
@@ -87,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(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)
@@ -105,10 +106,9 @@ class Sliver(PlCoreBase):
             return u'unsaved-sliver'
 
     def save(self, *args, **kwds):
-        self.name = self.slice.slicename
+        self.name = self.slice.name
         if not self.creator and hasattr(self, 'caller'):
             self.creator = self.caller
-        self.controllerNetwork = self.node.controller
 
 # XXX smbaker - disabled for now, was causing fault in tenant view create slice
 #        if not self.controllerNetwork.test_acl(slice=self.slice):