Integrated gateway and updated kube support

Restructured the test env to decouple the test engine from the components

Issue-ID: NONRTRIC-441

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I07c746741b1c5c964679545f0a12861e5e9f6292
diff --git a/test/simulator-group/httpproxy/docker-compose.yaml b/test/simulator-group/httpproxy/docker-compose.yml
similarity index 92%
rename from test/simulator-group/httpproxy/docker-compose.yaml
rename to test/simulator-group/httpproxy/docker-compose.yml
index 7d61802..ff4243b 100644
--- a/test/simulator-group/httpproxy/docker-compose.yaml
+++ b/test/simulator-group/httpproxy/docker-compose.yml
@@ -29,4 +29,7 @@
     tty: true
     command: mitmweb --web-host 0.0.0.0 --no-web-open-browser --set ssl_insecure
     ports:
-      - ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
\ No newline at end of file
+      - ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
+    labels:
+      - "nrttest_app=HTTPPROXY"
+      - "nrttest_dp=${HTTP_PROXY_DISPLAY_NAME}"
diff --git a/test/simulator-group/httpproxy/svc.yaml b/test/simulator-group/httpproxy/svc.yaml
index cd27563..1e3c009 100644
--- a/test/simulator-group/httpproxy/svc.yaml
+++ b/test/simulator-group/httpproxy/svc.yaml
@@ -5,9 +5,9 @@
   namespace: $KUBE_SIM_NAMESPACE
   labels:
     run: $HTTP_PROXY_APP_NAME
-    autotest: HTTP_PROXY_APP_NAME
+    autotest: HTTPPROXY
 spec:
-  type: ClusterIP
+  type: NodePort
   ports:
   - port: $HTTP_PROXY_EXTERNAL_PORT
     targetPort: $HTTP_PROXY_INTERNAL_PORT
@@ -18,4 +18,4 @@
     protocol: TCP
     name: web
   selector:
-    run: $HTTP_PROXY_APP_NAME
\ No newline at end of file
+    run: $HTTP_PROXY_APP_NAME