git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50643d6
)
add content provider info to welcome screen
author
Scott Baker
<smbaker@gmail.com>
Tue, 29 Apr 2014 18:29:45 +0000
(11:29 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Tue, 29 Apr 2014 18:29:45 +0000
(11:29 -0700)
planetstack/core/plus/views.py
patch
|
blob
|
history
diff --git
a/planetstack/core/plus/views.py
b/planetstack/core/plus/views.py
index
9c1bebc
..
9411712
100644
(file)
--- a/
planetstack/core/plus/views.py
+++ b/
planetstack/core/plus/views.py
@@
-8,6
+8,7
@@
import datetime
from pprint import pprint
import json
from core.models import *
from pprint import pprint
import json
from core.models import *
+from hpc.models import ContentProvider
from operator import attrgetter
from django.views.decorators.csrf import csrf_exempt
from django.http import HttpResponse, HttpResponseServerError
from operator import attrgetter
from django.views.decorators.csrf import csrf_exempt
from django.http import HttpResponse, HttpResponseServerError
@@
-36,16
+37,11
@@
class DashboardWelcomeView(TemplateView):
context['userSliceInfo'] = userDetails['userSliceInfo']
context['cdnData'] = userDetails['cdnData']
context['userSliceInfo'] = userDetails['userSliceInfo']
context['cdnData'] = userDetails['cdnData']
+ context['cdnContentProviders'] = userDetails['cdnContentProviders']
return self.render_to_response(context=context)
def getUserSliceInfo(user, tableFormat = False):
userDetails = {}
return self.render_to_response(context=context)
def getUserSliceInfo(user, tableFormat = False):
userDetails = {}
-# try:
-# // site = Site.objects.filter(id=user.site.id)
-# // except:
-# // site = Site.objects.filter(name="Princeton")
-# // userDetails['sitename'] = site[0].name
-# // userDetails['siteid'] = site[0].id
userSliceData = getSliceInfo(user)
if (tableFormat):
userSliceData = getSliceInfo(user)
if (tableFormat):
@@
-53,8
+49,8
@@
def getUserSliceInfo(user, tableFormat = False):
userDetails['userSliceInfo'] = userSliceTableFormatter(userSliceData)
else:
userDetails['userSliceInfo'] = userSliceData
userDetails['userSliceInfo'] = userSliceTableFormatter(userSliceData)
else:
userDetails['userSliceInfo'] = userSliceData
- userDetails['cdnData'] = getCDNOperatorData(wait=False)
;
-
# pprint( userDetails
)
+ userDetails['cdnData'] = getCDNOperatorData(wait=False)
+
userDetails['cdnContentProviders'] = getCDNContentProviderData(
)
return userDetails
class TenantCreateSlice(View):
return userDetails
class TenantCreateSlice(View):
@@
-233,6
+229,15
@@
def getSliceInfo(user):
return userSliceInfo
return userSliceInfo
+def getCDNContentProviderData():
+ cps = []
+ for dm_cp in ContentProvider.objects.all():
+ cp = {"name": dm_cp.name,
+ "account": dm_cp.account}
+ cps.append(cp)
+
+ return cps
+
def getCDNOperatorData(randomizeData = False, wait=True):
HPC_SLICE_NAME = "HyperCache"
def getCDNOperatorData(randomizeData = False, wait=True):
HPC_SLICE_NAME = "HyperCache"
@@
-277,7
+282,7
@@
def getCDNOperatorData(randomizeData = False, wait=True):
"lat": float(site.location.latitude),
"health": 0,
"numNodes": int(site.nodes.count()),
"lat": float(site.location.latitude),
"health": 0,
"numNodes": int(site.nodes.count()),
- "activeHPCSlivers": int(stats_row.get("count_hostname", 0)),
# measured number of slivers, from bigquery statistics
+ "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),
"bandwidth": stats_row.get("sum_computed_bytes_sent_div_elapsed",0),
"numHPCSlivers": allocated_slivers, # allocated number of slivers, from data model
"siteUrl": str(site.site_url),
"bandwidth": stats_row.get("sum_computed_bytes_sent_div_elapsed",0),