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:
0ba78ce
)
remove sliver.numberCores
author
Scott Baker
<smbaker@gmail.com>
Wed, 3 Sep 2014 00:38:40 +0000
(17:38 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Wed, 3 Sep 2014 00:38:40 +0000
(17:38 -0700)
planetstack/core/dashboard/views/view_common.py
patch
|
blob
|
history
diff --git
a/planetstack/core/dashboard/views/view_common.py
b/planetstack/core/dashboard/views/view_common.py
index
7a42f2f
..
7d51435
100644
(file)
--- a/
planetstack/core/dashboard/views/view_common.py
+++ b/
planetstack/core/dashboard/views/view_common.py
@@
-68,7
+68,7
@@
def getSliceInfo(user):
for sliver in slice.slivers.all():
#sites_used['deploymentSites'] = sliver.node.deployment.name
# sites_used[sliver.image.name] = sliver.image.name
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
+ sites_used[sliver.node.site.name] =
1 #
sliver.numberCores
sliceid = Slice.objects.get(id=entry.slice.id).id
try:
sliverList = Sliver.objects.filter(slice=entry.slice.id)
sliceid = Slice.objects.get(id=entry.slice.id).id
try:
sliverList = Sliver.objects.filter(slice=entry.slice.id)
@@
-204,8
+204,7
@@
def slice_increase_slivers(user, user_ip, siteList, slice, image, count, noAct=F
node=node,
image = image,
creator = User.objects.get(email=user),
node=node,
image = image,
creator = User.objects.get(email=user),
- deploymentNetwork=node.deployment,
- numberCores =1 )
+ deploymentNetwork=node.deployment)
sliver.save()
node.sliverCount = node.sliverCount + 1
sliver.save()
node.sliverCount = node.sliverCount + 1