Changed Docker and K8s config files

data-hub/agent-discovery-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/agent-discovery-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/agent-discovery-microservice/deployment/loadbalancer.yml → data-hub/agent-discovery-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: agent-discovery-endpoint
+  name: agent-discovery
   
 spec:
   type: LoadBalancer

data-hub/community-detection-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/community-detecion-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/community-detection-microservice/deployment/loadbalancer.yml → data-hub/community-detection-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: community-detection-endpoint
+  name: community-detection
   
 spec:
   type: LoadBalancer

data-hub/democratic-reasoning-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/democratic-reasoning-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/democratic-reasoning-microservice/deployment/loadbalancer.yml → data-hub/democratic-reasoning-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: democratic-reasoning-endpoint
+  name: democratic-reasoning
   
 spec:
   type: LoadBalancer

data-hub/geo-profiling-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/geo-profiling-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/geo-profiling-microservice/deployment/loadbalancer.yml → data-hub/geo-profiling-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: geo-profiling-endpoint
+  name: geo-profiling
   
 spec:
   type: LoadBalancer

data-hub/pareto-trust-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/pareto-trust-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/pareto-trust-microservice/deployment/loadbalancer.yml → data-hub/pareto-trust-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: pareto-trust-endpoint
+  name: pareto-trust
   
 spec:
   type: LoadBalancer

data-hub/reputation-calculation-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/reputation-calculation-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/reputation-calculation-microservice/deployment/loadbalancer.yml → data-hub/reputation-calculation-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: reputation-calculation-endpoint
+  name: reputation-calculation
   
 spec:
   type: LoadBalancer

data-hub/role-discovery-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/role-discovery-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/role-discovery-microservice/deployment/loadbalancer.yml → data-hub/role-discovery-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: role-discovery-endpoint
+  name: role-discovery
   
 spec:
   type: LoadBalancer

data-hub/semantic-linking-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/semantic-linking-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/semantic-linking-microservice/deployment/loadbalancer.yml → data-hub/semantic-linking-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: semantic-linking-endpoint
+  name: semantic-linking
   
 spec:
   type: LoadBalancer

data-hub/stage-discovery-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY data-hub/stage-discovery-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

data-hub/stage-discovery-microservice/deployment/loadbalancer.yml → data-hub/stage-discovery-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: stage-discovery-endpoint
+  name: stage-discovery
   
 spec:
   type: LoadBalancer

deploy.py

@@ -10,5 +10,5 @@ for r, _, f in os.walk('./'):
 
 for path in paths:
     os.system(f"kubectl apply -f {path}deployment.yml")
-    os.system(f"kubectl apply -f {path}loadbalancer.yml")
+    os.system(f"kubectl apply -f {path}service.yml")
 

transaction-hub-in/network-metrics-retrieval-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY transaction-hub-in/network-metrics-retrieval-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

transaction-hub-in/network-metrics-retrieval-microservice/deployment/loadbalancer.yml → transaction-hub-in/network-metrics-retrieval-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: network-metrics-retrieval-endpoint
+  name: network-metrics-retrieval
   
 spec:
   type: LoadBalancer

transaction-hub-in/trace-retrieval-microservice/app/main.py

+# add modules folder to interpreter path
 import sys
-sys.path.insert(1, '../../../modules/')
+import os
+modules_path = '../../../modules/'
+if os.path.exists(modules_path):
+    sys.path.insert(1, modules_path)
 
+# init logging to file
 import logging
 LOG_FORMAT = ('%(levelname) -5s %(asctime)s %(name)s:%(funcName) -35s %(lineno) -5d:  %(message)s')
 logging.basicConfig(filename='trace-retrieval.log', level=logging.WARNING, format=LOG_FORMAT)

transaction-hub-out/event-detection-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY transaction-hub-out/event-detection-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

transaction-hub-out/event-detection-microservice/deployment/loadbalancer.yml → transaction-hub-out/event-detection-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: event-detection-endpoint
+  name: event-detection
   
 spec:
   type: LoadBalancer

transaction-hub-out/smart-matching-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY transaction-hub-out/smart-matching-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

transaction-hub-out/smart-matching-microservice/deployment/loadbalancer.yml → transaction-hub-out/smart-matching-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: smart-matching-endpoint
+  name: smart-matching
   
 spec:
   type: LoadBalancer

transaction-hub-out/tokenized-decision-making-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY transaction-hub-out/tokenized-decision-making-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

transaction-hub-out/tokenized-decision-making-microservice/deployment/loadbalancer.yml → transaction-hub-out/tokenized-decision-making-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: tokenized-decision-making-endpoint
+  name: tokenized-decision-making
   
 spec:
   type: LoadBalancer

transaction-hub-out/trust-sla-microservice/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install connexion[swagger-ui]
 EXPOSE 5000
 
 WORKDIR /app
-COPY app/ /app/
+COPY transaction-hub-out/trust-sla-microservice/app/ /app/
 RUN chmod a+x main.py
 
 CMD ["python", "./main.py"]
\ No newline at end of file

transaction-hub-out/trust-sla-microservice/deployment/loadbalancer.yml → transaction-hub-out/trust-sla-microservice/deployment/service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 
 metadata:
-  name: trust-sla-endpoint
+  name: trust-sla
   
 spec:
   type: LoadBalancer