X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fmethods%2Ftenantview.py;h=44db514c957f10671de95d32033fe5a8a06b1aa6;hp=c7ce500b2baf68d5b090ebfd2829d5b00d448c71;hb=1236fe63b898e1d11d2307268cc7ab21fceafbbb;hpb=319aa5b02452353b4172343c0c69f084adc5e062

diff --git a/planetstack/core/xoslib/methods/tenantview.py b/planetstack/core/xoslib/methods/tenantview.py
index c7ce500..44db514 100644
--- a/planetstack/core/xoslib/methods/tenantview.py
+++ b/planetstack/core/xoslib/methods/tenantview.py
@@ -13,14 +13,17 @@ from syndicate_storage.models import Volume
 
 BLESSED_DEPLOYMENTS = ["ViCCI"] # ["US-MaxPlanck", "US-GeorgiaTech", "US-Princeton", "US-Washington", "US-Stanford"]
 
-
-def getTenantViewDict():
+def getTenantViewDict(user):
     blessed_sites = []
     for site in Site.objects.all():
         good=False
         for deployment in site.deployments.all():
             if deployment.name in BLESSED_DEPLOYMENTS:
-                good=True
+                # only bless sites that have at least one node in the deployment
+                sitedeployments = SiteDeployment.objects.filter(site=site, deployment=deployment)
+                for sd in sitedeployments.all():
+                    if sd.nodes.count()>0:
+                        good=True
         if good:
             blessed_sites.append(site)
 
@@ -33,19 +36,55 @@ def getTenantViewDict():
         if good:
             blessed_images.append(image)
 
+    blessed_flavors=[]
+    for flavor in Flavor.objects.all():
+        good = False
+        for deployment in flavor.deployments.all():
+            if deployment.name in BLESSED_DEPLOYMENTS:
+                 good=True
+        if good:
+            blessed_flavors.append(flavor)
+
     volumes=[]
     for volume in Volume.objects.all():
         if not volume.private:
             volumes.append(volume)
 
+    site_users=[]
+    user_site_roles=[]
+    user_site_id=None
+    user_site_login_base=None
+    if not user.site:
+        pass # this is probably an error
+    else:
+        user_site_id = user.site.id
+        user_site_login_base = user.site.login_base
+        for auser in user.site.users.all():
+            site_users.append(auser)
+
+        for priv in user.site.siteprivileges.filter(user=user):
+            user_site_roles.append(priv.role.role)
+
+    blessed_service_classes = [ServiceClass.objects.get(name="Best Effort")]
+
     return {"id": 0,
             "blessed_deployment_names": BLESSED_DEPLOYMENTS,
             "blessed_site_names": [site.name for site in blessed_sites],
             "blessed_sites": [site.id for site in blessed_sites],
             "blessed_image_names": [image.name for image in blessed_images],
             "blessed_images": [image.id for image in blessed_images],
+            "blessed_flavor_names": [flavor.name for flavor in blessed_flavors],
+            "blessed_flavors": [flavor.id for flavor in blessed_flavors],
+            "blessed_service_class_names": [serviceclass.name for serviceclass in blessed_service_classes],
+            "blessed_service_classes": [serviceclass.id for serviceclass in blessed_service_classes],
             "public_volume_names": [volume.name for volume in volumes],
             "public_volumes": [volume.id for volume in volumes],
+            "current_user_site_id": user_site_id,
+            "current_user_login_base": user_site_login_base,
+            "current_user_site_users": [auser.id for auser in site_users],
+            "current_user_site_user_names": [auser.email for auser in site_users],
+            "current_user_can_create_slice": user.is_admin or ("pi" in user_site_roles) or ("admin" in user_site_roles),
+            "current_user_id": user.id,
             }
 
 class TenantList(APIView):
@@ -53,12 +92,12 @@ class TenantList(APIView):
     method_name = "tenantview"
 
     def get(self, request, format=None):
-        return Response( getTenantViewDict() )
+        return Response( getTenantViewDict(request.user) )
 
 class TenantDetail(APIView):
     method_kind = "detail"
     method_name = "tenantview"
 
     def get(self, request, format=None, pk=0):
-        return Response( [getTenantViewDict()] )
+        return Response( [getTenantViewDict(request.user)] )