Merge branch 'develop' into fix/ofc22-tests

deploy_in_kubernetes.sh

@@ -110,10 +110,12 @@ for COMPONENT in $COMPONENTS; do
     fi
 
     echo "  Deploying '$COMPONENT' component to Kubernetes..."
-    DEPLOY_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"
+    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"
     kubectl --namespace $K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"
-    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT}service >> "$DEPLOY_LOG"
-    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT}service >> "$DEPLOY_LOG"
+
+    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
+    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
+    kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"
     printf "\n"
 done
 

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/requirements.in

 numpy==1.23.*
-scikit-learn==1.12.*
-onnxruntime==1.1.*
+onnxruntime==1.12.*
+scikit-learn==1.1.*

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