X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fobjects%2Fsliceplus.py;h=d3e618dcf071218bdcaafbd9bdfbdf6b3bc63903;hb=0093647259a08b6a8ac35bab421a2a4d3a194f19;hp=94174b4915d00d44370b7e7e0440173942e4bdc2;hpb=03c932fef9efc6728c8e81df6e0627625e3e0421;p=plstackapi.git diff --git a/planetstack/core/xoslib/objects/sliceplus.py b/planetstack/core/xoslib/objects/sliceplus.py index 94174b4..d3e618d 100644 --- a/planetstack/core/xoslib/objects/sliceplus.py +++ b/planetstack/core/xoslib/objects/sliceplus.py @@ -19,6 +19,7 @@ class SlicePlus(Slice, PlusObjectMixin): def getSliceInfo(self, user=None): if not self._sliceInfo: used_sites = {} + ready_sites = {} used_deployments = {} sliverCount = 0 sshCommands = [] @@ -33,6 +34,8 @@ class SlicePlus(Slice, PlusObjectMixin): sshCommand = 'ssh -o "ProxyCommand ssh -q %s@%s" ubuntu@%s' % (sliver.instance_id, sliver.node.name, sliver.instance_name) 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()): @@ -51,6 +54,7 @@ class SlicePlus(Slice, PlusObjectMixin): networkPorts = network.ports self._sliceInfo= {"sitesUsed": used_sites, + "sitesReady": ready_sites, "deploymentsUsed": used_deployments, "sliverCount": sliverCount, "siteCount": len(used_sites.keys()), @@ -66,6 +70,14 @@ class SlicePlus(Slice, PlusObjectMixin): 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): return self._site_allocation