Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into...

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/microk8s-deployment

src/l3_attackmitigator/service/l3_attackmitigatorService.py

@@ -21,7 +21,7 @@ from grpc_health.v1.health_pb2_grpc import add_HealthServicer_to_server
 from common.proto.l3_attackmitigator_pb2_grpc import (
     add_L3AttackmitigatorServicer_to_server,
 )
-from common.service.l3_attackmitigatorServiceServicerImpl import (
+from l3_attackmitigator.service.l3_attackmitigatorServiceServicerImpl import (
     l3_attackmitigatorServiceServicerImpl,
 )
 from l3_attackmitigator.Config import (

src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py

@@ -27,7 +27,7 @@ from common.proto.l3_centralizedattackdetector_pb2_grpc import (
 )
 
 from common.proto.l3_attackmitigator_pb2 import (
-    Output,
+    L3AttackmitigatorOutput,
 )
 from common.proto.l3_attackmitigator_pb2_grpc import (
     L3AttackmitigatorStub,
@@ -88,7 +88,7 @@ class l3_centralizedattackdetectorServiceServicerImpl(L3Centralizedattackdetecto
             output_message["tag_name"] = "Normal"
             output_message["tag"] = 0
 
-        return Output(**output_message)
+        return L3AttackmitigatorOutput(**output_message)
 
     def SendInput(self, request, context):
         # PERFORM INFERENCE WITH SENT INPUTS