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:
a36d77e
)
merge Amisha changes
author
Scott Baker
<smbaker@gmail.com>
Fri, 29 Aug 2014 19:19:09 +0000
(12:19 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Fri, 29 Aug 2014 19:19:09 +0000
(12:19 -0700)
planetstack/core/dashboard/views/tenant.py
patch
|
blob
|
history
diff --git
a/planetstack/core/dashboard/views/tenant.py
b/planetstack/core/dashboard/views/tenant.py
index
2048dd5
..
0555867
100644
(file)
--- a/
planetstack/core/dashboard/views/tenant.py
+++ b/
planetstack/core/dashboard/views/tenant.py
@@
-188,7
+188,7
@@
def getTenantInfo(user):
sliceNode = {}
sliceInstance= {}
#createPrivateVolume(user,sliceName)
sliceNode = {}
sliceInstance= {}
#createPrivateVolume(user,sliceName)
- available_sites = get
_available_s
ites()
+ available_sites = get
AvailableS
ites()
for sliver in slice.slivers.all():
if sliver.node.site.name in available_sites:
sliceSite[sliver.node.site.name] = sliceSite.get(sliver.node.site.name,0) + 1
for sliver in slice.slivers.all():
if sliver.node.site.name in available_sites:
sliceSite[sliver.node.site.name] = sliceSite.get(sliver.node.site.name,0) + 1
@@
-416,7
+416,7
@@
def tenant_pick_sites(user, user_ip=None, slice=None, count=None):
print "exception in geo code"
traceback.print_exc()
print "exception in geo code"
traceback.print_exc()
- available_sites = get
_available_s
ites()
+ available_sites = get
AvailableS
ites()
sites = Site.objects.all()
sites = [x for x in sites if x.name in available_sites]
sites = sorted(sites, key=functools.partial(siteSortKey, slice=slice, count=count, lat=lat, lon=lon))
sites = Site.objects.all()
sites = [x for x in sites if x.name in available_sites]
sites = sorted(sites, key=functools.partial(siteSortKey, slice=slice, count=count, lat=lat, lon=lon))