fix internal node address

controllers/resource_controller.py

@@ -28,6 +28,7 @@ class ResourceResource(Resource):
         if get_state() == Status.OFFLINE:
             return response_offline, 403
         node_address = normalize_url(request.host_url)
+        node_address_intern = normalize_url(request.host_url, True)
         update_state(Status.UPDATING, node_address)
 
         request_command: Optional[str] = request.get_json().get('command')
@@ -46,8 +47,8 @@ class ResourceResource(Resource):
 
         request_addresses = list(map(lambda x: normalize_url(x, True), request_addresses))
 
-        if len(request_addresses) > 0 and node_address in request_addresses:
-            request_addresses.remove(node_address)
+        if len(request_addresses) > 0 and node_address_intern in request_addresses:
+            request_addresses.remove(node_address_intern)
 
         command = Command(request_command)
 

controllers/resources_controller.py

@@ -30,6 +30,7 @@ class ResourcesResource(Resource):
         if get_state() == Status.OFFLINE:
             return response_offline, 403
         node_address = normalize_url(request.host_url)
+        internal_node_address = normalize_url(request.host_url, True)
         update_state(Status.UPDATING, node_address)
 
         request_command: Optional[str] = request.get_json().get('command')
@@ -48,8 +49,8 @@ class ResourcesResource(Resource):
             update_state(Status.ONLINE, node_address, {"message": "name is missing", "statusCode": 400})
             return {"message": "name is missing"}, 400
 
-        if len(request_addresses) != 0 and node_address in request_addresses:
-            request_addresses.remove(node_address)
+        if len(request_addresses) != 0 and internal_node_address in request_addresses:
+            request_addresses.remove(internal_node_address)
             
         resource = ResourceModel(
             request_name,

utils/http_utils.py

@@ -17,7 +17,7 @@ nodes = {
 
 def get_internal_url(port: int):
     # keep last 3 digits
-    port = port % 1000
+    port = (port % 1000)+1
     new_url = f"http://node{port}:3000/"
     print('getInternalUrl', new_url)
     return new_url
@@ -28,8 +28,7 @@ def normalize_url(url: str, inter: bool = False):
     parsed_url = urlparse(url)
     format = parsed_url.scheme + "://" + parsed_url.netloc + "/"
     if inter:
-        get_internal_url(parsed_url.port | 3000)
-        url = nodes.get(url,None)
+        url = get_internal_url(parsed_url.port | 3000)
         if url is None:
             print('normalize intern', url, file=sys.stderr)
             return