From: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
Date: Thu, 20 Feb 2025 13:37:47 +0000 (+0100)
Subject: Fix About issue in ODLUX
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d14ea68978075cf75bf8635532c42faedd1f6599;p=oam.git

Fix About issue in ODLUX

- change on oam/docker-compose plus related volume
- in addition a copy/paste fix on teardown.sh

Issue-ID: OAM-432
Change-Id: I025d524177fe405ddc3f1870817e0194208f084b
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
---

diff --git a/solution/smo/oam/docker-compose.yaml b/solution/smo/oam/docker-compose.yaml
index f7dce3a..378bebe 100755
--- a/solution/smo/oam/docker-compose.yaml
+++ b/solution/smo/oam/docker-compose.yaml
@@ -28,6 +28,8 @@ services:
       SDNRHOST: controller
       SDNRPORT: ${SDNC_REST_PORT}
       SDNRWEBSOCKETPORT: ${SDNR_WEBSOCKET_PORT}
+    volumes:
+      - ./odlux/location.rules:/opt/bitnami/nginx/conf/server_blocks/location.rules
     labels:
       traefik.enable: true
       traefik.http.routers.sdnc-web.entrypoints: websecure
diff --git a/solution/smo/oam/odlux/location.rules b/solution/smo/oam/odlux/location.rules
new file mode 100644
index 0000000..97a3541
--- /dev/null
+++ b/solution/smo/oam/odlux/location.rules
@@ -0,0 +1,34 @@
+location ~ ^/$  {
+    return 301 " /odlux/index.html";
+}
+location ~ ^/help/$  {
+    try_files /help/$args.json $uri;
+}
+location ~ ^/transportpce  {
+    resolver 127.0.0.11;
+    if ($request_uri ~* "/transportpce/(.*)") { 
+        return 404;
+    }
+}
+location ~ ^/tiles/  {
+    resolver 1.1.1.1 ipv6=off;
+    if ($request_uri ~* "/tiles/(.*)") { 
+        return 404;
+    }
+}
+location ~ ^/topology/  {
+    resolver 127.0.0.11;
+    return 404;
+}
+location /  {
+    try_files $uri $uri/ @backend;
+}
+location /websocket {
+    proxy_pass http://controller:8182/websocket;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+}
+location @backend {
+    proxy_pass http://controller:8181;
+}
\ No newline at end of file
diff --git a/solution/teardown.sh b/solution/teardown.sh
index 0e50cae..b70df13 100755
--- a/solution/teardown.sh
+++ b/solution/teardown.sh
@@ -22,5 +22,4 @@ docker compose -f $SCRIPT_DIR/network/docker-compose.yaml down
 docker compose -f $SCRIPT_DIR/smo/apps/docker-compose.yaml down
 docker compose -f $SCRIPT_DIR/smo/oam/docker-compose.yaml down
 docker compose -f $SCRIPT_DIR/smo/common/docker-compose.yaml down
-docker compose -f $SCRIPT_DIR/infra/docker-compose.yaml up down
-
+docker compose -f $SCRIPT_DIR/infra/docker-compose.yaml down