display ssh command in sliver detail view

[plstackapi.git] / planetstack / core / xoslib / objects / sliceplus.py

diff --git a/planetstack/core/xoslib/objects/sliceplus.py b/planetstack/core/xoslib/objects/sliceplus.py
index 9a70e25..6bbbfa2 100644 (file)
--- a/planetstack/core/xoslib/objects/sliceplus.py
+++ b/planetstack/core/xoslib/objects/sliceplus.py
@@ -1,6 +1,7 @@
 from core.models import Slice, SlicePrivilege, SliceRole, Sliver, Site, Node, User
 from plus import PlusObjectMixin
 from operator import itemgetter, attrgetter
 from core.models import Slice, SlicePrivilege, SliceRole, Sliver, Site, Node, User
 from plus import PlusObjectMixin
 from operator import itemgetter, attrgetter

+from rest_framework.exceptions import APIException

 
 class SlicePlus(Slice, PlusObjectMixin):
     class Meta:
 
 class SlicePlus(Slice, PlusObjectMixin):
     class Meta:


@@ -8,15 +9,21 @@ class SlicePlus(Slice, PlusObjectMixin):
 
     def __init__(self, *args, **kwargs):
         super(SlicePlus, self).__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         super(SlicePlus, self).__init__(*args, **kwargs)

-        self._update_site_allocation = None

         self._update_users = None
         self._sliceInfo = None
         self._update_users = None
         self._sliceInfo = None

+        self.getSliceInfo()
+        self._site_allocation = self._sliceInfo["sitesUsed"]
+        self._initial_site_allocation = self._site_allocation
+        self._network_ports = self._sliceInfo["networkPorts"]
+        self._initial_network_ports = self._network_ports

 
     def getSliceInfo(self, user=None):
         if not self._sliceInfo:
             used_sites = {}
 
     def getSliceInfo(self, user=None):
         if not self._sliceInfo:
             used_sites = {}

+            ready_sites = {}

             used_deployments = {}
             sliverCount = 0
             used_deployments = {}
             sliverCount = 0

+            sshCommands = []

             for sliver in self.slivers.all():
                 site = sliver.node.site_deployment.site
                 deployment = sliver.node.site_deployment.deployment
             for sliver in self.slivers.all():
                 site = sliver.node.site_deployment.site
                 deployment = sliver.node.site_deployment.deployment


@@ -24,18 +31,38 @@ class SlicePlus(Slice, PlusObjectMixin):
                 used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1
                 sliverCount = sliverCount + 1
 
                 used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1
                 sliverCount = sliverCount + 1
 

+                sshCommand = sliver.get_ssh_command()
+                if sshCommand:
+                    sshCommands.append(sshCommand)
+
+                    ready_sites[site.name] = ready_sites.get(site.name, 0) + 1
+

             users = {}
             for priv in SlicePrivilege.objects.filter(slice=self):
                 if not (priv.user.id in users.keys()):
                     users[priv.user.id] = {"name": priv.user.email, "id": priv.user.id, "roles": []}
                 users[priv.user.id]["roles"].append(priv.role.role)
 
             users = {}
             for priv in SlicePrivilege.objects.filter(slice=self):
                 if not (priv.user.id in users.keys()):
                     users[priv.user.id] = {"name": priv.user.email, "id": priv.user.id, "roles": []}
                 users[priv.user.id]["roles"].append(priv.role.role)
 

+            # XXX this assumes there is only one network that can have ports bound
+            # to it for a given slice. This is intended for the tenant view, which
+            # will obey this field.
+            networkPorts = ""
+            for networkSlice in self.networkslices.all():
+                network = networkSlice.network
+                if (network.owner.id != self.id):
+                    continue
+                if network.ports:
+                    networkPorts = network.ports
+

             self._sliceInfo= {"sitesUsed": used_sites,
             self._sliceInfo= {"sitesUsed": used_sites,

+                    "sitesReady": ready_sites,

                     "deploymentsUsed": used_deployments,
                     "sliverCount": sliverCount,
                     "siteCount": len(used_sites.keys()),
                     "users": users,
                     "deploymentsUsed": used_deployments,
                     "sliverCount": sliverCount,
                     "siteCount": len(used_sites.keys()),
                     "users": users,

-                    "roles": []}
+                    "roles": [],
+                    "sshCommands": sshCommands,
+                    "networkPorts": networkPorts}

 
         if user:
             auser = self._sliceInfo["users"].get(user.id, None)
 
         if user:
             auser = self._sliceInfo["users"].get(user.id, None)


@@ -44,14 +71,21 @@ class SlicePlus(Slice, PlusObjectMixin):
 
         return self._sliceInfo
 
 
         return self._sliceInfo
 

+    @property
+    def site_ready(self):
+        return self.getSliceInfo()["sitesReady"]
+
+    @site_ready.setter
+    def site_ready(self, value):
+        pass
+

     @property
     def site_allocation(self):
     @property
     def site_allocation(self):

-        return self.getSliceInfo()["sitesUsed"]
+        return self._site_allocation

 
     @site_allocation.setter
     def site_allocation(self, value):
 
     @site_allocation.setter
     def site_allocation(self, value):

-        self._update_site_allocation = value
-        #print "XXX set sitesUsed to", value
+        self._site_allocation = value

 
     @property
     def user_names(self):
 
     @property
     def user_names(self):


@@ -72,20 +106,12 @@ class SlicePlus(Slice, PlusObjectMixin):
 
     @property
     def network_ports(self):
 
     @property
     def network_ports(self):

-        # XXX this assumes there is only one network that can have ports bound
-        # to it for a given slice. This is intended for the tenant view, which
-        # will obey this field.
-        networkPorts = ""
-        for networkSlice in self.networkslices.all():
-            network = networkSlice.network
-            if network.ports:
-                networkPorts = network.ports
-
-        return networkPorts
+        return self._network_ports

 
     @network_ports.setter
     def network_ports(self, value):
 
     @network_ports.setter
     def network_ports(self, value):

-        print "XXX set networkPorts to", value
+        self._network_ports = value
+        #print "XXX set networkPorts to", value

 
     @staticmethod
     def select_by_user(user):
 
     @staticmethod
     def select_by_user(user):


@@ -109,26 +135,45 @@ class SlicePlus(Slice, PlusObjectMixin):
         return nodeList
 
     def save(self, *args, **kwargs):
         return nodeList
 
     def save(self, *args, **kwargs):

+        updated_image = self.has_field_changed("default_image")
+        updated_flavor = self.has_field_changed("default_flavor")
+

         super(SlicePlus, self).save(*args, **kwargs)
 
         super(SlicePlus, self).save(*args, **kwargs)
 

-        if self._update_site_allocation:
-            self.save_site_allocation(noAct=True)
+        # try things out first
+
+        updated_sites = (self._site_allocation != self._initial_site_allocation) or updated_image or updated_flavor
+        if updated_sites:
+            self.save_site_allocation(noAct=True, reset=(updated_image or updated_flavor))

 
         if self._update_users:
             self.save_users(noAct=True)
 
 
         if self._update_users:
             self.save_users(noAct=True)
 

-        if self._update_site_allocation:
-            self.save_site_allocation()
+        if (self._network_ports != self._initial_network_ports):
+            self.save_network_ports(noAct=True)
+
+        # now actually save them
+
+        if updated_sites:
+            self.save_site_allocation(reset=(updated_image or updated_flavor))

 
         if self._update_users:
             self.save_users()
 
 
         if self._update_users:
             self.save_users()
 

-    def save_site_allocation(self, noAct = False):
-        new_site_allocation = self._update_site_allocation
+        if (self._network_ports != self._initial_network_ports):
+            self.save_network_ports()
+
+    def save_site_allocation(self, noAct = False, reset=False):
+        print "save_site_allocation, reset=",reset
+
+        if (not self._site_allocation):
+            # Must be a sliver that was just created, and has not site_allocation
+            # field.
+            return

 
         all_slice_slivers = self.slivers.all()
 
         all_slice_slivers = self.slivers.all()

-        for site_name in new_site_allocation.keys():
-            desired_allocation = new_site_allocation[site_name]
+        for site_name in self._site_allocation.keys():
+            desired_allocation = self._site_allocation[site_name]

 
             # make a list of the slivers for this site
             slivers = []
 
             # make a list of the slivers for this site
             slivers = []


@@ -137,11 +182,13 @@ class SlicePlus(Slice, PlusObjectMixin):
                     slivers.append(sliver)
 
             # delete extra slivers
                     slivers.append(sliver)
 
             # delete extra slivers

-            while (len(slivers) > desired_allocation):
+            while (reset and len(slivers)>0) or (len(slivers) > desired_allocation):

                 sliver = slivers.pop()
                 sliver = slivers.pop()

-                print "deleting sliver", sliver

                 if (not noAct):
                 if (not noAct):

+                    print "deleting sliver", sliver

                     sliver.delete()
                     sliver.delete()

+                else:
+                    print "would delete sliver", sliver

 
             # add more slivers
             if (len(slivers) < desired_allocation):
 
             # add more slivers
             if (len(slivers) < desired_allocation):


@@ -149,7 +196,7 @@ class SlicePlus(Slice, PlusObjectMixin):
                 nodes = self.get_node_allocation([site])
 
                 if (not nodes):
                 nodes = self.get_node_allocation([site])
 
                 if (not nodes):

-                    raise ValueError("no nodes in site %s" % site_name)
+                    raise APIException(detail="no nodes in site %s" % site_name)

 
                 while (len(slivers) < desired_allocation):
                     # pick the least allocated node
 
                 while (len(slivers) < desired_allocation):
                     # pick the least allocated node


@@ -165,9 +212,10 @@ class SlicePlus(Slice, PlusObjectMixin):
                             deployment = node.site_deployment.deployment)
                     slivers.append(sliver)
                     if (not noAct):
                             deployment = node.site_deployment.deployment)
                     slivers.append(sliver)
                     if (not noAct):

+                        print "added sliver", sliver

                         sliver.save()
                         sliver.save()

-
-                    print "added sliver", sliver
+                    else:
+                        print "would add sliver", sliver

 
                     node.sliverCount = node.sliverCount + 1
 
 
                     node.sliverCount = node.sliverCount + 1
 


@@ -198,6 +246,36 @@ class SlicePlus(Slice, PlusObjectMixin):
 
                  print "deleted user id", user_id
 
 
                  print "deleted user id", user_id
 

+    def save_network_ports(self, noAct=False):
+        # First search for any network that already has a filled in 'ports'
+        # field. We'll assume there can only be one, so it must be the right
+        # one.
+        for networkSlice in self.networkslices.all():
+            network = networkSlice.network
+            if (network.owner.id != self.id):
+                continue
+            if network.ports:
+                network.ports = self._network_ports
+                if (not noAct):
+                    network.save()
+                return
+
+        # Now try a network that is a "NAT", since setting ports on a non-NAT
+        # network doesn't make much sense.
+        for networkSlice in self.networkslices.all():
+            network = networkSlice.network
+            if (network.owner.id != self.id):
+                continue
+            if network.template.translation=="NAT":
+                network.ports = self._network_ports
+                if (not noAct):
+                    network.save()
+                return
+
+        # uh oh, we didn't find a network
+
+        raise APIException(detail="No network was found that ports could be set on")
+