refactor sliceplus core for users, return user ids and names in sliceplus object

[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 bbab060..4fdc824 100644 (file)
--- a/planetstack/core/xoslib/objects/sliceplus.py
+++ b/planetstack/core/xoslib/objects/sliceplus.py
@@ -1,4 +1,4 @@
-from core.models import Slice, SlicePrivilege, Sliver, Site, Node
+from core.models import Slice, SlicePrivilege, SliceRole, Sliver, Site, Node, User
 from plus import PlusObjectMixin
 from operator import itemgetter, attrgetter
 
@@ -10,27 +10,39 @@ class SlicePlus(Slice, PlusObjectMixin):
         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):
@@ -41,13 +53,13 @@ class SlicePlus(Slice, PlusObjectMixin):
         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):
@@ -80,7 +92,7 @@ class SlicePlus(Slice, PlusObjectMixin):
             qs = SlicePlus.objects.filter(id__in=slice_ids)
         return qs
 
-    def get_site_node_allocation(self, siteList):
+    def get_node_allocation(self, siteList):
         siteIDList = [site.id for site in siteList]
         nodeList = []
         for node in Node.objects.all():
@@ -97,12 +109,20 @@ class SlicePlus(Slice, PlusObjectMixin):
 
         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() # Sliver.objects.filter(slice=self)
+        all_slice_slivers = self.slivers.all()
         for site_name in new_site_allocation.keys():
             desired_allocation = new_site_allocation[site_name]
 
@@ -122,7 +142,7 @@ class SlicePlus(Slice, PlusObjectMixin):
             # add more slivers
             if (len(slivers) < desired_allocation):
                 site = Site.objects.get(name = site_name)
-                nodes = self.get_site_node_allocation([site])
+                nodes = self.get_node_allocation([site])
 
                 if (not nodes):
                     raise ValueError("no nodes in site %s" % site_name)
@@ -147,4 +167,34 @@ class SlicePlus(Slice, PlusObjectMixin):
 
                     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
+
+
+
+