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/control_panel/docker-compose.yml b/test/simulator-group/control_panel/docker-compose.yml
index 0d603a0..94628fa 100644
--- a/test/simulator-group/control_panel/docker-compose.yml
+++ b/test/simulator-group/control_panel/docker-compose.yml
@@ -28,5 +28,8 @@
ports:
- ${CONTROL_PANEL_EXTERNAL_PORT}:${CONTROL_PANEL_INTERNAL_PORT}
- ${CONTROL_PANEL_EXTERNAL_SECURE_PORT}:${CONTROL_PANEL_INTERNAL_SECURE_PORT}
-
-
+ volumes:
+ - ${CONTROL_PANEL_HOST_MNT_DIR}/$CONTROL_PANEL_CONFIG_FILE:${CONTROL_PANEL_CONFIG_MOUNT_PATH}/$CONTROL_PANEL_CONFIG_FILE
+ labels:
+ - "nrttest_app=CP"
+ - "nrttest_dp=${CONTROL_PANEL_DISPLAY_NAME}"
diff --git a/test/simulator-group/control_panel/nginx.conf b/test/simulator-group/control_panel/nginx.conf
new file mode 100644
index 0000000..0014ffb
--- /dev/null
+++ b/test/simulator-group/control_panel/nginx.conf
@@ -0,0 +1,39 @@
+################################################################################
+# Copyright (c) 2021 Nordix Foundation. #
+# #
+# Licensed under the Apache License, Version 2.0 (the "License"); #
+# you may not use this file except in compliance with the License. #
+# You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+################################################################################
+
+events{}
+
+http {
+ include /etc/nginx/mime.types;
+ resolver 127.0.0.11;
+ server {
+ listen 8080;
+ server_name localhost;
+ root /usr/share/nginx/html;
+ index index.html;
+ location /a1-policy/ {
+ set $upstream ${NGW_DOMAIN_NAME};
+ proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
+ }
+ location /ei-producer/{
+ set $upstream ${NGW_DOMAIN_NAME};
+ proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
+ }
+ location / {
+ try_files $uri $uri/ /index.html;
+ }
+ }
+}