Implement ECS based on Dong's perfsonar server

NOTE: Does NOT support IP request yet

Signed-off-by: Kai Gao <[email protected]>

Author: emiapwil

Dockerfile

@@ -2,8 +2,8 @@ FROM python:3.10.7
 
 COPY . /tmp/alto
 RUN rm -rf /tmp/alto/.git && \
-    pip install redis geoip2 kazoo && \
-    pip install /tmp/alto && \
+    pip install redis geoip2 kazoo -i https://pypi.tuna.tsinghua.edu.cn/simple && \
+    pip install /tmp/alto -i https://pypi.tuna.tsinghua.edu.cn/simple && \
     rm -rf /tmp/alto
 
 EXPOSE 8000

src/alto/server/components/backend.py

@@ -42,7 +42,6 @@
                        TEST_DYNAMIC_NM_5)
 
 from .db import data_broker_manager
-from .vcs import vcs_singleton
 
 
 class MockService:
@@ -360,6 +359,8 @@ class TIPSControlService:
     """
 
     def __init__(self, namespace, tips_resource_id='', **kwargs) -> None:
+        from .vcs import vcs_singleton
+
         self.ns = namespace
         self.vcs = vcs_singleton
         self.tips_resource_id = tips_resource_id

src/alto/server/components/ext/perfsonar.py

@@ -26,21 +26,20 @@
 
 import requests
 
-from alto.config import Config
-
 class WrappedPerfSonarServiceV1:
     """
     Backend algorithm for ECS based on PerfSonar wrapper
 
     This algorithm is basically a proxy
     """
 
-    def __init__(self, uri, **kwargs):
+    def __init__(self, namespace, uri=None, **kwargs):
+        self.namespace = namespace
         self.uri = uri
 
     def lookup(self, srcs, dsts, cost_type):
         headers = {
-            'accept': 'application/json'
+            'content-type': 'application/json'
         }
         req = {
             'cost-type': {
@@ -55,6 +54,5 @@ def lookup(self, srcs, dsts, cost_type):
                 }
             ]
         }
-        data = requests.post(self.uri, data=req, headers=headers)
-        print(data)
-        return None
+        resp = requests.post(self.uri, json=req, headers=headers)
+        return resp.json()

src/alto/server/northbound/alto/render.py

@@ -64,7 +64,8 @@ class EndpointCostRender(JSONRenderer):
 
     def render(self, ecmap, accepted_media_type=None, renderer_context=None):
         data = dict()
-        data['endpoint-cost-map'] = ecmap
+        data['meta'] = ecmap['meta']
+        data['endpoint-cost-map'] = ecmap['endpoint-cost-map']
         return super(EndpointCostRender, self).render(data, accepted_media_type,
                                                       renderer_context)
 

src/alto/server/northbound/alto/views.py

@@ -289,7 +289,7 @@ class TIPSView(APIView):
     renderer_classes = [TIPSRender]
     parser_classes = [TIPSParser]
 
-    algorithm = TIPSControlService(config.get_default_namespace())
+    algorithm = None # TIPSControlService(config.get_default_namespace())
     resource_id = ''
     content_type = ALTO_CONTENT_TYPE_TIPS
 
@@ -310,7 +310,7 @@ class TIPSMetadataView(APIView):
     """
     renderer_classes = [TIPSRender]
 
-    algorithm = TIPSControlService(config.get_default_namespace())
+    algorithm = None # TIPSControlService(config.get_default_namespace())
     resource_id = ''
     content_type = ALTO_CONTENT_TYPE_TIPS_VIEW
 
@@ -336,7 +336,7 @@ class TIPSDataTransferView(APIView):
     """
     renderer_classes = [TIPSRender]
 
-    algorithm = TIPSControlService(config.get_default_namespace())
+    algorithm = None # TIPSControlService(config.get_default_namespace())
     resource_id = ''
     content_type = ALTO_CONTENT_TYPE_TIPS