X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fobjects%2Fsliceplus.py;h=4fdc8247b944fc392c7169fcde10f39dd5895145;hp=adbc77e658a8d104c7c276d5c2e41efeb5ac78d3;hb=597aee34a24f6469a7161973c4f8170dae87e9d0;hpb=9496740998d3d5aeaf3c2f76b312f309c15c4f60 diff --git a/planetstack/core/xoslib/objects/sliceplus.py b/planetstack/core/xoslib/objects/sliceplus.py index adbc77e..4fdc824 100644 --- a/planetstack/core/xoslib/objects/sliceplus.py +++ b/planetstack/core/xoslib/objects/sliceplus.py @@ -1,30 +1,48 @@ -from core.models.slice import Slice, SlicePrivilege +from core.models import Slice, SlicePrivilege, SliceRole, Sliver, Site, Node, User from plus import PlusObjectMixin +from operator import itemgetter, attrgetter class SlicePlus(Slice, PlusObjectMixin): class Meta: proxy = True + def __init__(self, *args, **kwargs): + super(SlicePlus, self).__init__(*args, **kwargs) + self._update_site_allocation = None + self._update_users = None + self._sliceInfo = None + def getSliceInfo(self, user=None): - used_sites = {} - used_deployments = {} - sliverCount = 0 - for sliver in self.slivers.all(): - site = sliver.node.site_deployment.site - deployment = sliver.node.site_deployment.deployment - used_sites[site.name] = used_sites.get(site.name, 0) + 1 - used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1 - sliverCount = sliverCount + 1 - - roles = [] - if (user!=None): - roles = [x.role.role for x in self.sliceprivileges.filter(user=user)] - - return {"sitesUsed": used_sites, - "deploymentsUsed": used_deployments, - "sliverCount": sliverCount, - "siteCount": len(used_sites.keys()), - "roles": roles} + if not self._sliceInfo: + used_sites = {} + used_deployments = {} + sliverCount = 0 + for sliver in self.slivers.all(): + site = sliver.node.site_deployment.site + deployment = sliver.node.site_deployment.deployment + used_sites[site.name] = used_sites.get(site.name, 0) + 1 + used_deployments[deployment.name] = used_deployments.get(deployment.name, 0) + 1 + sliverCount = sliverCount + 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) + + self._sliceInfo= {"sitesUsed": used_sites, + "deploymentsUsed": used_deployments, + "sliverCount": sliverCount, + "siteCount": len(used_sites.keys()), + "users": users, + "roles": []} + + if user: + auser = self._sliceInfo["users"].get(user.id, None) + if (auser): + self._sliceInfo["roles"] = auser["roles"] + + return self._sliceInfo @property def site_allocation(self): @@ -32,19 +50,21 @@ class SlicePlus(Slice, PlusObjectMixin): @site_allocation.setter def site_allocation(self, value): - print "XXX set sitesUsed to", value + self._update_site_allocation = value + #print "XXX set sitesUsed to", value + + @property + def user_names(self): + return [user["name"] for user in self.getSliceInfo()["users"].values()] @property def users(self): - user_ids = [] - for priv in SlicePrivilege.objects.filter(slice=self): - if not (priv.user.id in user_ids): - user_ids.append(priv.user.id) - return user_ids + return [user["id"] for user in self.getSliceInfo()["users"].values()] @users.setter def users(self, value): - print "XXX set users to", value + self._update_users = value + #print "XXX set users to", value @property def network_ports(self): @@ -71,3 +91,110 @@ class SlicePlus(Slice, PlusObjectMixin): slice_ids = [sp.slice.id for sp in SlicePrivilege.objects.filter(user=user)] qs = SlicePlus.objects.filter(id__in=slice_ids) return qs + + def get_node_allocation(self, siteList): + siteIDList = [site.id for site in siteList] + nodeList = [] + for node in Node.objects.all(): + if (node.site_deployment.site.id in siteIDList): + node.sliverCount = 0 + for sliver in node.slivers.all(): + if sliver.slice.id == self.id: + node.sliverCount = node.sliverCount + 1 + nodeList.append(node) + return nodeList + + def save(self, *args, **kwargs): + super(SlicePlus, self).save(*args, **kwargs) + + if self._update_site_allocation: + self.save_site_allocation(noAct=True) + + if self._update_users: + self.save_users(noAct=True) + + if self._update_site_allocation: + self.save_site_allocation() + + if self._update_users: + self.save_users() + + def save_site_allocation(self, noAct = False): + new_site_allocation = self._update_site_allocation + + all_slice_slivers = self.slivers.all() + for site_name in new_site_allocation.keys(): + desired_allocation = new_site_allocation[site_name] + + # make a list of the slivers for this site + slivers = [] + for sliver in all_slice_slivers: + if sliver.node.site_deployment.site.name == site_name: + slivers.append(sliver) + + # delete extra slivers + while (len(slivers) > desired_allocation): + sliver = slivers.pop() + print "deleting sliver", sliver + if (not noAct): + sliver.delete() + + # add more slivers + if (len(slivers) < desired_allocation): + site = Site.objects.get(name = site_name) + nodes = self.get_node_allocation([site]) + + if (not nodes): + raise ValueError("no nodes in site %s" % site_name) + + while (len(slivers) < desired_allocation): + # pick the least allocated node + nodes = sorted(nodes, key=attrgetter("sliverCount")) + node = nodes[0] + + sliver = Sliver(name=node.name, + slice=self, + node=node, + image = self.default_image, + flavor = self.default_flavor, + creator = self.creator, + deployment = node.site_deployment.deployment) + slivers.append(sliver) + if (not noAct): + sliver.save() + + print "added sliver", sliver + + node.sliverCount = node.sliverCount + 1 + + def save_users(self, noAct = False): + new_users = self._update_users + + default_role = SliceRole.objects.get(role="default") + + slice_privs = self.sliceprivileges.all() + slice_user_ids = [priv.user.id for priv in slice_privs] + + for user_id in new_users: + if (user_id not in slice_user_ids): + priv = SlicePrivilege(slice=self, user=User.objects.get(id=user_id), role=default_role) + if (not noAct): + priv.save() + + print "added user id", user_id + + for priv in slice_privs: + if (priv.role.id != default_role.id): + # only mess with 'default' users; don't kill an admin + continue + + if (priv.user.id not in new_users): + if (not noAct): + priv.delete() + + print "deleted user id", user_id + + + + +