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/consul_cbs/docker-compose.yml b/test/simulator-group/consul_cbs/docker-compose.yml
index 15d3de1..4bf9271 100644
--- a/test/simulator-group/consul_cbs/docker-compose.yml
+++ b/test/simulator-group/consul_cbs/docker-compose.yml
@@ -33,6 +33,9 @@
       - ${CONSUL_EXTERNAL_PORT}:${CONSUL_INTERNAL_PORT}
     volumes:
       - ./consul/:/consul/config
+    labels:
+      - "nrttest_app=CONSUL"
+      - "nrttest_dp=${CONSUL_DISPLAY_NAME}"
 
   config-binding-service:
     networks:
@@ -45,4 +48,7 @@
       - CONSUL_HOST=${CONSUL_HOST}
     depends_on:
       - ${CONSUL_HOST}
+    labels:
+      - "nrttest_app=CBS"
+      - "nrttest_dp=${CBS_DISPLAY_NAME}"