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
objects = SliverManager()
deleted_objects = SliverDeletionManager()
instance_id = models.CharField(null=True, blank=True, max_length=200, help_text="Nova instance id")
+ instance_uuid = models.CharField(null=True, blank=True, max_length=200, help_text="Nova instance uuid")
name = models.CharField(max_length=200, help_text="Sliver name")
instance_name = models.CharField(blank=True, null=True, max_length=200, help_text="OpenStack generated name")
ip = models.GenericIPAddressField(help_text="Sliver ip address", blank=True, null=True)
#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)
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):