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
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()
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')
- deploymentNetwork = models.ForeignKey(Deployment, verbose_name='deployment', related_name='sliver_deploymentNetwork')
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.deploymentNetwork = self.node.deployment
# 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)
def get_node_stats(self):
# Note sure what should go back here
return 1
+
+ def get_ssh_command(self):
+ if (not self.instance_id) or (not self.node) or (not self.instance_name):
+ return None
+ else:
+ return 'ssh -o "ProxyCommand ssh -q %s@%s" ubuntu@%s' % (self.instance_id, self.node.name, self.instance_name)