split off GetSlices and GetNodes from GetConfiguration
diff --git a/planetstack/core/views/legacyapi.py b/planetstack/core/views/legacyapi.py
index b6494e1..e70fa57 100644
--- a/planetstack/core/views/legacyapi.py
+++ b/planetstack/core/views/legacyapi.py
@@ -237,19 +237,25 @@
'sites': sites,
'nodes': nodes}
-def DoGetConfiguration():
+def HandleGetConfiguration():
find_multi_slicename("princeton_vcoblitz")
- slices = GetSlices()
- nodes = GetNodes()
configs={}
for slicename in ["princeton_vcoblitz"]:
configs[slicename] = GetConfiguration({"name": slicename})
+ return configs
- result = {"configs": configs,
- "slices": slices,
- "nodes": nodes}
+def HandleGetNodes():
+ find_multi_slicename("princeton_vcoblitz")
+ return GetNodes()
- return result
+def HandleGetSlices():
+ find_multi_slicename("princeton_vcoblitz")
+ return GetSlices()
+
+
+FUNCS = {"GetConfiguration": HandleGetConfiguration,
+ "GetNodes": HandleGetNodes,
+ "GetSlices": HandleGetSlices}
@csrf_exempt
def LegacyXMLRPC(request):
@@ -257,8 +263,8 @@
try:
(args, method) = xmlrpclib.loads(request.body)
result = None
- if (method == "GetConfiguration"):
- result = DoGetConfiguration()
+ if method in FUNCS:
+ result = FUNCS[method]()
return HttpResponse(xmlrpclib.dumps((result,), methodresponse=True, allow_none=1))
except:
traceback.print_exc()