merge Amisha's changes
diff --git a/planetstack/core/plus/sites.py b/planetstack/core/plus/sites.py
index 6fd278b..c5dde52 100644
--- a/planetstack/core/plus/sites.py
+++ b/planetstack/core/plus/sites.py
@@ -12,13 +12,15 @@
def get_urls(self):
"""Add our dashboard view to the admin urlconf. Deleted the default index."""
from django.conf.urls import patterns, url
- from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView
+ from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView, TenantViewData,TenantCreateSlice
urls = super(AdminMixin, self).get_urls()
del urls[0]
custom_url = patterns('',
url(r'^$', self.admin_view(DashboardWelcomeView.as_view()),
name="index"),
+ url(r'^test/', self.admin_view(DashboardUserSiteView.as_view()),
+ name="test"),
url(r'^hpcdashuserslices/', self.admin_view(DashboardUserSiteView.as_view()),
name="hpcdashuserslices"),
url(r'^hpcdashboard/', self.admin_view(DashboardAjaxView.as_view()), # DEPRECATED
@@ -30,7 +32,11 @@
url(r'^analytics/(?P<name>\w+)/$', DashboardAnalyticsAjaxView.as_view(),
name="analytics"),
url(r'^dashboardaddorremsliver/$', self.admin_view(DashboardAddOrRemoveSliverView.as_view()),
- name="addorremsliver")
+ name="addorremsliver"),
+ url(r'^tenantview/$', self.admin_view(TenantViewData.as_view()),
+ name="tenantview"),
+ url(r'^createnewslice/$', self.admin_view(TenantCreateSlice.as_view()),
+ name="createnewslice")
)
return custom_url + urls
diff --git a/planetstack/core/plus/views.py b/planetstack/core/plus/views.py
index a50d946..0078d91 100644
--- a/planetstack/core/plus/views.py
+++ b/planetstack/core/plus/views.py
@@ -5,8 +5,9 @@
import datetime
from pprint import pprint
import json
-from core.models import Slice,SliceRole,SlicePrivilege,Site,Reservation,Sliver
+from core.models import *
from django.http import HttpResponse
+from django.core import urlresolvers
import traceback
if os.path.exists("/home/smbaker/projects/vicci/cdn/bigquery"):
@@ -47,6 +48,64 @@
# pprint( userDetails)
return userDetails
+class TenantCreateSlice(View):
+ def post(self, request, *args, **kwargs):
+ sliceName = request.POST.get("sliceName", "0")
+ serviceClass = request.POST.get("serviceClass", "0")
+ imageName = request.POST.get("imageName", "0")
+ actionToDo = request.POST.get("actionToDo", "0")
+ print sliceName
+ if (actionToDo == "add"):
+ serviceClass = ServiceClass.objects.get(name=serviceClass)
+ site = request.user.site
+ #image = Image.objects.get(name=imageName)
+ newSlice = Slice(name=sliceName,serviceClass=serviceClass,site=site,imagePreference=imageName)
+ newSlice.save()
+ return newSlice
+
+
+def getTenantSliceInfo(user, tableFormat = False):
+ tenantSliceDetails = {}
+ tenantSliceData = getTenantInfo(user)
+ tenantServiceClassData = getServiceClassInfo(user)
+ if (tableFormat):
+ tenantSliceDetails['userSliceInfo'] = userSliceTableFormatter(tenantSliceData)
+ tenantSliceDetails['sliceServiceClass']=userSliceTableFormatter(tenantServiceClassData)
+ else:
+ tenantSliceDetails['userSliceInfo'] = tenantSliceData
+ tenantSliceDetails['sliceServiceClass']=userSliceTableFormatter(tenantServiceClassData)
+ tenantSliceDetails['image']=userSliceTableFormatter(getImageInfo(user))
+ tenantSliceDetails['network']=userSliceTableFormatter(getNetworkInfo(user))
+ tenantSliceDetails['deploymentSites']=userSliceTableFormatter(getDeploymentSites())
+ tenantSliceDetails['sites'] = userSliceTableFormatter(getTenantSitesInfo());
+ return tenantSliceDetails
+
+
+def getTenantInfo(user):
+ slices =Slice.objects.all()
+ userSliceInfo = []
+ for entry in slices:
+ sliceName = Slice.objects.get(id=entry.id).name
+ slice = Slice.objects.get(name=Slice.objects.get(id=entry.id).name)
+ sliceServiceClass = entry.serviceClass.name
+ preferredImage = entry.imagePreference
+ numSliver = 0
+ sliceImage=""
+ sliceSite = {}
+ for sliver in slice.slivers.all():
+ numSliver +=sliver.numberCores
+ # sliceSite[sliver.deploymentNetwork.name] =sliceSite.get(sliver.deploymentNetwork.name,0) + 1
+ sliceSite[sliver.node.site.name] = sliceSite.get(sliver.node.site.name,0) + 1
+ sliceImage = sliver.image.name
+ userSliceInfo.append({'sliceName': sliceName,'sliceServiceClass': sliceServiceClass,'preferredImage':preferredImage, 'sliceSite':sliceSite,'sliceImage':sliceImage,'numOfSlivers':numSliver})
+ return userSliceInfo
+
+def getTenantSitesInfo():
+ tenantSiteInfo=[]
+ for entry in Site.objects.all():
+ tenantSiteInfo.append({'siteName':entry.name})
+ return tenantSiteInfo
+
def userSliceTableFormatter(data):
# pprint(data)
formattedData = {
@@ -54,6 +113,36 @@
}
return formattedData
+def getServiceClassInfo(user):
+ serviceClassList = ServiceClass.objects.all()
+ sliceInfo = []
+ for entry in serviceClassList:
+ sliceInfo.append({'serviceClass':entry.name})
+ return sliceInfo
+
+def getImageInfo(user):
+ imageList = Image.objects.all()
+ imageInfo = []
+ for imageEntry in imageList:
+ imageInfo.append({'Image':imageEntry.name})
+ return imageInfo
+
+def getNetworkInfo(user):
+ #networkList = Network.objects.all()
+ networkList = ['Private Only','Private and Publicly Routable']
+ networkInfo = []
+ for networkEntry in networkList:
+ #networkInfo.append({'Network':networkEntry.name})
+ networkInfo.append({'Network':networkEntry})
+ return networkInfo
+
+def getDeploymentSites():
+ deploymentList = Deployment.objects.all()
+ deploymentInfo = []
+ for entry in deploymentList:
+ deploymentInfo.append({'DeploymentSite':entry.name})
+ return deploymentInfo
+
def getSliceInfo(user):
sliceList = Slice.objects.all()
slicePrivs = SlicePrivilege.objects.filter(user=user)
@@ -61,6 +150,13 @@
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)
+ sliverList=Sliver.objects.all()
+ sites_used = {}
+ for sliver in slice.slivers.all():
+ #sites_used['deploymentSites'] = sliver.node.deployment.name
+ # sites_used[sliver.image.name] = sliver.image.name
+ sites_used[sliver.node.site.name] = sliver.numberCores
sliceid = Slice.objects.get(id=entry.slice.id).id
try:
sliverList = Sliver.objects.filter(slice=entry.slice.id)
@@ -76,7 +172,10 @@
sitecount = 0
userSliceInfo.append({'slicename': slicename, 'sliceid':sliceid,
- 'role': SliceRole.objects.get(id=entry.role.id).role, 'slivercount': slivercount, 'sitecount':sitecount})
+ 'sitesUsed':sites_used,
+ 'role': SliceRole.objects.get(id=entry.role.id).role,
+ 'slivercount': slivercount,
+ 'sitecount':sitecount})
return userSliceInfo
@@ -110,6 +209,10 @@
def get(self, request, **kwargs):
return HttpResponse(json.dumps(getUserSliceInfo(request.user, True)), mimetype='application/javascript')
+class TenantViewData(View):
+ def get(self, request, **kwargs):
+ return HttpResponse(json.dumps(getTenantSliceInfo(request.user, True)), mimetype='application/javascript')
+
class DashboardSummaryAjaxView(View):
def get(self, request, **kwargs):
return HttpResponse(json.dumps(hpc_wizard.get_hpc_wizard().get_summary_for_view()), mimetype='application/javascript')