refactor and bug fixes

[plstackapi.git] / planetstack / core / dashboard / views / view_common.py

diff --git a/planetstack/core/dashboard/views/view_common.py b/planetstack/core/dashboard/views/view_common.py
index 7d51435..f05d40a 100644 (file)
--- a/planetstack/core/dashboard/views/view_common.py
+++ b/planetstack/core/dashboard/views/view_common.py
@@ -61,8 +61,13 @@ def getSliceInfo(user):
     userSliceInfo = []
     for entry in slicePrivs:
 
-        slicename = Slice.objects.get(id=entry.slice.id).name
-        slice = Slice.objects.get(name=Slice.objects.get(id=entry.slice.id).name)
+        slice = Slice.objects.filter(id=entry.slice.id)
+        if not slice:
+            # the privilege is to a slice that doesn't exist
+            print "data model consistency problem, slice %s doesn't exist" % entry.slice.id
+            continue
+        slice = slice[0]
+        slicename = slice.name
         sliverList=Sliver.objects.all()
         sites_used = {}
         for sliver in slice.slivers.all():
@@ -152,7 +157,7 @@ def getCDNOperatorData(randomizeData = False, wait=True):
         new_row = {"lat": lat,
                "long": long,
                "health": 0,
-               "numNodes": int(site.nodes.count()),
+               #"numNodes": int(site.nodes.count()),
                "activeHPCSlivers": int(stats_row.get("count_hostname", 0)),     # measured number of slivers, from bigquery statistics
                "numHPCSlivers": allocated_slivers,                              # allocated number of slivers, from data model
                "siteUrl": str(site.site_url),