From 01ef649428b0452c059b679928f324470342bc18 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 29 Aug 2014 12:19:09 -0700 Subject: [PATCH] merge Amisha changes --- planetstack/core/dashboard/views/tenant.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/planetstack/core/dashboard/views/tenant.py b/planetstack/core/dashboard/views/tenant.py index 2048dd5..0555867 100644 --- 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) - available_sites = get_available_sites() + available_sites = getAvailableSites() 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() - available_sites = get_available_sites() + available_sites = getAvailableSites() 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)) -- 2.43.0