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:
378baea
)
change mimetype to content_type
author
Scott Baker
<smbaker@gmail.com>
Mon, 16 Jun 2014 17:25:39 +0000
(10:25 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Mon, 16 Jun 2014 17:25:39 +0000
(10:25 -0700)
planetstack/core/dashboard/views/analytics.py
patch
|
blob
|
history
planetstack/core/dashboard/views/cdn.py
patch
|
blob
|
history
planetstack/core/dashboard/views/customize.py
patch
|
blob
|
history
planetstack/core/dashboard/views/interactions.py
patch
|
blob
|
history
planetstack/core/dashboard/views/tenant.py
patch
|
blob
|
history
planetstack/core/dashboard/views/test.py
patch
|
blob
|
history
diff --git
a/planetstack/core/dashboard/views/analytics.py
b/planetstack/core/dashboard/views/analytics.py
index
09d1bbc
..
e1794c1
100644
(file)
--- a/
planetstack/core/dashboard/views/analytics.py
+++ b/
planetstack/core/dashboard/views/analytics.py
@@
-1,9
+1,10
@@
from view_common import *
from view_common import *
+import random
class DashboardAnalyticsAjaxView(View):
def get(self, request, name="hello_world", **kwargs):
if (name == "bigquery"):
(mimetype, data) = DoPlanetStackAnalytics(request)
class DashboardAnalyticsAjaxView(View):
def get(self, request, name="hello_world", **kwargs):
if (name == "bigquery"):
(mimetype, data) = DoPlanetStackAnalytics(request)
- return HttpResponse(data,
mime
type=mimetype)
+ return HttpResponse(data,
content_
type=mimetype)
else:
else:
- return HttpResponse(json.dumps("Unknown"),
mime
type='application/javascript')
+ return HttpResponse(json.dumps("Unknown"),
content_
type='application/javascript')
diff --git
a/planetstack/core/dashboard/views/cdn.py
b/planetstack/core/dashboard/views/cdn.py
index
63ec2f2
..
4fb29cb
100644
(file)
--- a/
planetstack/core/dashboard/views/cdn.py
+++ b/
planetstack/core/dashboard/views/cdn.py
@@
-19,7
+19,7
@@
class DashboardSummaryAjaxView(View):
"total_bandwidth": total_bandwidth,
"average_cpu": average_cpu}
"total_bandwidth": total_bandwidth,
"average_cpu": average_cpu}
- return HttpResponse(json.dumps(result),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(result),
content_
type='application/javascript')
class DashboardAddOrRemoveSliverView(View):
# TODO: deprecate this view in favor of using TenantAddOrRemoveSliverView
class DashboardAddOrRemoveSliverView(View):
# TODO: deprecate this view in favor of using TenantAddOrRemoveSliverView
@@
-42,8
+42,8
@@
class DashboardAddOrRemoveSliverView(View):
print '*' * 50
print 'Ask for site: ' + siteName + ' to ' + actionToDo + ' another HPC Sliver'
print '*' * 50
print 'Ask for site: ' + siteName + ' to ' + actionToDo + ' another HPC Sliver'
- return HttpResponse(json.dumps("Success"),
mime
type='application/javascript')
+ return HttpResponse(json.dumps("Success"),
content_
type='application/javascript')
class DashboardAjaxView(View):
def get(self, request, **kwargs):
class DashboardAjaxView(View):
def get(self, request, **kwargs):
- return HttpResponse(json.dumps(getCDNOperatorData(True)),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(getCDNOperatorData(True)),
content_
type='application/javascript')
diff --git
a/planetstack/core/dashboard/views/customize.py
b/planetstack/core/dashboard/views/customize.py
index
f081cfb
..
212cc4d
100644
(file)
--- a/
planetstack/core/dashboard/views/customize.py
+++ b/
planetstack/core/dashboard/views/customize.py
@@
-18,5
+18,5
@@
class DashboardCustomize(View):
udbv = UserDashboardView(user=request.user, dashboardView=dashboard, order=i)
\r
udbv.save()
\r
\r
udbv = UserDashboardView(user=request.user, dashboardView=dashboard, order=i)
\r
udbv.save()
\r
\r
- return HttpResponse(json.dumps("Success"),
mime
type='application/javascript')
+ return HttpResponse(json.dumps("Success"),
content_
type='application/javascript')
diff --git
a/planetstack/core/dashboard/views/interactions.py
b/planetstack/core/dashboard/views/interactions.py
index
23d755f
..
a2f88ff
100644
(file)
--- a/
planetstack/core/dashboard/views/interactions.py
+++ b/
planetstack/core/dashboard/views/interactions.py
@@
-35,7
+35,7
@@
class DashboardSliceInteractions(View):
result["title"] = "Slice interactions by sliver nodes"
result["objectName"] = "nodes"
result["title"] = "Slice interactions by sliver nodes"
result["objectName"] = "nodes"
- return HttpResponse(json.dumps(result),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(result),
content_
type='application/javascript')
def build_id_list(self, slices, name):
ids_by_slice = {}
def build_id_list(self, slices, name):
ids_by_slice = {}
diff --git
a/planetstack/core/dashboard/views/tenant.py
b/planetstack/core/dashboard/views/tenant.py
index
9066a2b
..
930ccf6
100644
(file)
--- a/
planetstack/core/dashboard/views/tenant.py
+++ b/
planetstack/core/dashboard/views/tenant.py
@@
-31,7
+31,7
@@
class TenantCreateSlice(View):
addOrModifyPorts(networkPorts,sliceName)
\r
if privateVolume=="true":
\r
privateVolForSlice(request.user,sliceName)
addOrModifyPorts(networkPorts,sliceName)
\r
if privateVolume=="true":
\r
privateVolForSlice(request.user,sliceName)
- return HttpResponse(json.dumps("Slice created"),
mime
type='application/javascript')
+ return HttpResponse(json.dumps("Slice created"),
content_
type='application/javascript')
def privateVolForSlice(user,sliceName):
if not hasPrivateVolume(sliceName):
\r
def privateVolForSlice(user,sliceName):
if not hasPrivateVolume(sliceName):
\r
@@
-64,7
+64,7
@@
class TenantUpdateSlice(View):
addOrModifyPorts(networkPorts,sliceName)
\r
if privateVolume=="true":
\r
privateVolForSlice(request.user,sliceName)
\r
addOrModifyPorts(networkPorts,sliceName)
\r
if privateVolume=="true":
\r
privateVolForSlice(request.user,sliceName)
\r
- return HttpResponse(json.dumps("Slice updated"),
mime
type='application/javascript')
\r
+ return HttpResponse(json.dumps("Slice updated"),
content_
type='application/javascript')
\r
\r
def addNetwork(name,template,sliceName):
\r
networkTemplate=NetworkTemplate.objects.get(name=template)
\r
\r
def addNetwork(name,template,sliceName):
\r
networkTemplate=NetworkTemplate.objects.get(name=template)
\r
@@
-237,7
+237,7
@@
class TenantDeleteSliceView(View):
#print slice, slice.id
\r
sliceToDel=Slice(name=sliceName, id=slice.id)
\r
sliceToDel.delete()
#print slice, slice.id
\r
sliceToDel=Slice(name=sliceName, id=slice.id)
\r
sliceToDel.delete()
- return HttpResponse(json.dumps("Slice deleted"),
mime
type='application/javascript')
+ return HttpResponse(json.dumps("Slice deleted"),
content_
type='application/javascript')
class TenantAddOrRemoveSliverView(View):
""" Add or remove slivers from a Slice
class TenantAddOrRemoveSliverView(View):
""" Add or remove slivers from a Slice
@@
-283,7
+283,7
@@
class TenantAddOrRemoveSliverView(View):
else:
return HttpResponseServerError("Unknown actionToDo %s" % actionToDo)
else:
return HttpResponseServerError("Unknown actionToDo %s" % actionToDo)
- return HttpResponse(json.dumps(sitesChanged),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(sitesChanged),
content_
type='application/javascript')
def get(self, request, *args, **kwargs):
request.POST = request.GET
def get(self, request, *args, **kwargs):
request.POST = request.GET
@@
-300,7
+300,7
@@
class TenantPickSitesView(View):
ip = request.GET.get("ip", get_ip(request))
sites = tenant_pick_sites(request.user, user_ip=ip, count=0, slice=slice)
sites = [x.name for x in sites]
ip = request.GET.get("ip", get_ip(request))
sites = tenant_pick_sites(request.user, user_ip=ip, count=0, slice=slice)
sites = [x.name for x in sites]
- return HttpResponse(json.dumps(sites),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(sites),
content_
type='application/javascript')
def siteSortKey(site, slice=None, count=None, lat=None, lon=None):
# try to pick a site we're already using
def siteSortKey(site, slice=None, count=None, lat=None, lon=None):
# try to pick a site we're already using
@@
-336,4
+336,4
@@
def tenant_pick_sites(user, user_ip=None, slice=None, count=None):
class TenantViewData(View):
def get(self, request, **kwargs):
class TenantViewData(View):
def get(self, request, **kwargs):
- return HttpResponse(json.dumps(getTenantSliceInfo(request.user, True)),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(getTenantSliceInfo(request.user, True)),
content_
type='application/javascript')
diff --git
a/planetstack/core/dashboard/views/test.py
b/planetstack/core/dashboard/views/test.py
index
24380c5
..
4eae215
100644
(file)
--- a/
planetstack/core/dashboard/views/test.py
+++ b/
planetstack/core/dashboard/views/test.py
@@
-2,4
+2,4
@@
from view_common import *
class DashboardUserSiteView(View):
def get(self, request, **kwargs):
class DashboardUserSiteView(View):
def get(self, request, **kwargs):
- return HttpResponse(json.dumps(getDashboardContext(request.user, tableFormat=True)),
mime
type='application/javascript')
+ return HttpResponse(json.dumps(getDashboardContext(request.user, tableFormat=True)),
content_
type='application/javascript')