fix camelcasing of networkPorts -> network_ports

[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 6e586d2..efb6b2a 100644 (file)
--- a/planetstack/core/xoslib/objects/sliceplus.py
+++ b/planetstack/core/xoslib/objects/sliceplus.py
@@ -10,15 +10,15 @@ class SlicePlus(Slice, PlusObjectMixin):
         used_deployments = {}
         sliverCount = 0
         for sliver in self.slivers.all():
-            site = sliver.node.site
-            deployment = sliver.node.deployment
+            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 for x in self.sliceprivileges.filter(user=user)]
+            roles = [x.role.role for x in self.sliceprivileges.filter(user=user)]
 
         return {"sitesUsed": used_sites,
                 "deploymentsUsed": used_deployments,
@@ -26,6 +26,23 @@ class SlicePlus(Slice, PlusObjectMixin):
                 "siteCount": len(used_sites.keys()),
                 "roles": roles}
 
+    @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
+
+    @network_ports.setter
+    def network_ports(self, value):
+        print "XXX set networkPorts to", value
+
     @staticmethod
     def select_by_user(user):
         if user.is_admin: