get site & deployment from slice_deployment in SlicePlus

[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..ddec295 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,