From: demx8as6 <martin.skorupski@highstreet-technologies.com>
Date: Wed, 5 Jul 2023 16:47:01 +0000 (+0000)
Subject: repo clean-up
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=012475c6dc5cfe7480715c87464d69234d4c51a2;p=oam.git

repo clean-up

- rename SOLUTION_DOMAIN env to HTTP_DOMAIN
- use ${env} within .env

Issue-ID: OAM-346
Change-Id: Icf6b86010f9f0fc0e353fbd47800c4fb37961e2b
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>
---

diff --git a/solution/network/docker-compose.yaml b/solution/network/docker-compose.yaml
index d8e2ed9..57d24ec 100755
--- a/solution/network/docker-compose.yaml
+++ b/solution/network/docker-compose.yaml
@@ -55,8 +55,8 @@ x-topo-env: &topo_env
 x-nf: &common_nf
     stop_grace_period: 5m
     extra_hosts:
-      - "controller.dcn.${GATEWAY_DOMAIN}:${HOST_IP}"
-      - "ves-collector.dcn.${GATEWAY_DOMAIN}:${HOST_IP}"
+      - "controller.dcn.${HTTP_DOMAIN}:${HOST_IP}"
+      - "ves-collector.dcn.${HTTP_DOMAIN}:${HOST_IP}"
     cap_add:
     - SYS_ADMIN
     - SYS_PTRACE
diff --git a/solution/smo/apps/.env b/solution/smo/apps/.env
index 1604e22..ad733dc 100644
--- a/solution/smo/apps/.env
+++ b/solution/smo/apps/.env
@@ -25,7 +25,7 @@ HOST_IP=aaa.bbb.ccc.ddd
 FLOWS_IMAGE=nodered/node-red:latest
 
 # gateway implemenyed by traefik
-SOLUTION_DOMAIN=smo.o-ran-sc.org
+HTTP_DOMAIN=smo.o-ran-sc.org
 
 # apps
 APP_VENDOR=O-RAN-SC-OAM-Project
diff --git a/solution/smo/apps/docker-compose.yaml b/solution/smo/apps/docker-compose.yaml
index 46614fe..552e69c 100644
--- a/solution/smo/apps/docker-compose.yaml
+++ b/solution/smo/apps/docker-compose.yaml
@@ -10,34 +10,34 @@ services:
     container_name: flows
     hostname: flows
     extra_hosts:
-      - "flows.oam.${SOLUTION_DOMAIN}:${HOST_IP}"
+      - "flows.oam.${HTTP_DOMAIN}:${HOST_IP}"
     environment:
       APP_VENDOR: ${APP_VENDOR}
       APP_SOURCE: ${APP_SOURCE}
       APP_NETWORK_FUNCTION_ID: ${APP_NETWORK_FUNCTION_ID}
       SDN_CONTROLLER_PROTOCOL: https
-      SDN_CONTROLLER_HOST: controller.dcn.${SOLUTION_DOMAIN}
+      SDN_CONTROLLER_HOST: controller.dcn.${HTTP_DOMAIN}
       SDN_CONTROLLER_PORT: 443
       SDN_CONTROLLER_USERNAME: ${ADMIN_USERNAME}
       SDN_CONTROLLER_PASSWORD: ${ADMIN_PASSWORD}
       VES_ENDPOINT_PROTOCOL: https
-      VES_ENDPOINT_HOST: ves-collector.dcn.${SOLUTION_DOMAIN}
+      VES_ENDPOINT_HOST: ves-collector.dcn.${HTTP_DOMAIN}
       VES_ENDPOINT_PORT: 443
       VES_ENDPOINT_AUTH_METHOD: ${VES_ENDPOINT_AUTH_METHOD}
       VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME}
       VES_ENDPOINT_PASSWORD: ${VES_ENDPOINT_PASSWORD}
       MESSAGES_PROTOCOL: https
-      MESSAGES_HOST: messages.${SOLUTION_DOMAIN}
+      MESSAGES_HOST: messages.${HTTP_DOMAIN}
       MESSAGES_PORT: 443
       KAFKA_BRIDGE_PROTOCOL: https
-      KAFKA_BRIDGE_HOST: kafka-bridge.${SOLUTION_DOMAIN}
+      KAFKA_BRIDGE_HOST: kafka-bridge.${HTTP_DOMAIN}
       KAFKA_BRIDGE_PORT: 443
       KAFKA_BRIDGE_CONSUMER_GROUP: app
       KAFKA_BRIDGE_CONSUMER_NAME: message-consumer
     labels:
       traefik.enable: true
       traefik.http.routers.flows.entrypoints: websecure
-      traefik.http.routers.flows.rule: Host(`flows.oam.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.flows.rule: Host(`flows.oam.${HTTP_DOMAIN}`)
       traefik.http.routers.flows.tls: true
       traefik.http.services.flows.loadbalancer.server.port: 1880
     volumes:
@@ -57,7 +57,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.tests.entrypoints: websecure
-      traefik.http.routers.tests.rule: Host(`tests.oam.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.tests.rule: Host(`tests.oam.${HTTP_DOMAIN}`)
       traefik.http.routers.tests.tls: true
       traefik.http.services.tests.loadbalancer.server.port: 8080
     networks:
@@ -82,7 +82,7 @@ services:
     # labels:
     #   traefik.enable: true
     #   traefik.http.routers.wireshark.entrypoints: websecure
-    #   traefik.http.routers.wireshark.rule: Host(`wireshark.oam.${SOLUTION_DOMAIN}`)
+    #   traefik.http.routers.wireshark.rule: Host(`wireshark.oam.${HTTP_DOMAIN}`)
     #   traefik.http.routers.wireshark.tls: true
     #   traefik.http.services.wireshark.loadbalancer.server.port: 3000
     # networks:
diff --git a/solution/smo/common/docker-compose.yaml b/solution/smo/common/docker-compose.yaml
index ebfac8b..7afa49b 100755
--- a/solution/smo/common/docker-compose.yaml
+++ b/solution/smo/common/docker-compose.yaml
@@ -49,8 +49,8 @@ services:
       - --entrypoints.web.http.redirections.entrypoint.to=websecure
       - --entrypoints.web.http.redirections.entrypoint.scheme=https
       - --entrypoints.websecure.address=:443
-      - --entrypoints.websecure.http.tls.domains[0].main=gateway.${SOLUTION_DOMAIN}
-      - --entrypoints.websecure.http.tls.domains[0].sans=*.${SOLUTION_DOMAIN}
+      - --entrypoints.websecure.http.tls.domains[0].main=gateway.${HTTP_DOMAIN}
+      - --entrypoints.websecure.http.tls.domains[0].sans=*.${HTTP_DOMAIN}
       - --entrypoints.ssh-netconf-callhome.address=:4334
       - --entrypoints.tls-netconf-callhome.address=:4335
       - --providers.docker.endpoint=unix:///var/run/docker.sock
@@ -65,7 +65,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.middlewares.traefik-auth.basicauth.usersfile: .htpasswd
-      traefik.http.routers.gateway.rule: Host(`gateway.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.gateway.rule: Host(`gateway.${HTTP_DOMAIN}`)
       traefik.http.routers.gateway.entrypoints: websecure
       traefik.http.routers.gateway.service: api@internal
       traefik.http.routers.gateway.middlewares: strip
@@ -116,7 +116,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.identity.entrypoints: websecure
-      traefik.http.routers.identity.rule: Host(`identity.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.identity.rule: Host(`identity.${HTTP_DOMAIN}`)
       traefik.http.routers.identity.tls: true
       traefik.http.services.identity.loadbalancer.server.port: 8080
     depends_on:
@@ -189,7 +189,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.kafka-bridge.entrypoints: websecure
-      traefik.http.routers.kafka-bridge.rule: Host(`kafka-bridge.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.kafka-bridge.rule: Host(`kafka-bridge.${HTTP_DOMAIN}`)
       traefik.http.routers.kafka-bridge.tls: true
       traefik.http.services.kafka-bridge.loadbalancer.server.port: 8080
     volumes:
@@ -219,7 +219,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.topology.entrypoints: websecure
-      traefik.http.routers.topology.rule: Host(`topology.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.topology.rule: Host(`topology.${HTTP_DOMAIN}`)
       traefik.http.routers.topology.tls: true
       traefik.http.services.topology.loadbalancer.server.port: 8181
     networks:
@@ -239,7 +239,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.messages.entrypoints: websecure
-      traefik.http.routers.messages.rule: Host(`messages.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.messages.rule: Host(`messages.${HTTP_DOMAIN}`)
       traefik.http.routers.messages.tls: true
       traefik.http.services.messages.loadbalancer.server.port: 3904
     depends_on:
diff --git a/solution/smo/oam/docker-compose.yaml b/solution/smo/oam/docker-compose.yaml
index 0e5ada6..833c997 100755
--- a/solution/smo/oam/docker-compose.yaml
+++ b/solution/smo/oam/docker-compose.yaml
@@ -31,7 +31,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.sdnc-web.entrypoints: websecure
-      traefik.http.routers.sdnc-web.rule: Host(`odlux.oam.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.sdnc-web.rule: Host(`odlux.oam.${HTTP_DOMAIN}`)
       traefik.http.routers.sdnc-web.tls: true
       traefik.http.services.sdnc-web.loadbalancer.server.port: ${SDNC_WEB_PORT}
     depends_on:
@@ -46,7 +46,7 @@ services:
     container_name: controller
     hostname: controller
     extra_hosts:
-      - "controller.dcn.${SOLUTION_DOMAIN}:${HOST_IP}"
+      - "controller.dcn.${HTTP_DOMAIN}:${HOST_IP}"
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://localhost:${SDNC_REST_PORT}/ready || exit 1
       start_period: 60s
@@ -71,7 +71,7 @@ services:
       A1_ADAPTER_NORTHBOUND: false
       JAVA_OPTS: -Xms256m -Xmx4g
       IDENTITY_PROVIDER_URL: ${IDENTITY_PROVIDER_URL}
-      SDNC_WEB_URL: https://odlux.oam.${SOLUTION_DOMAIN}
+      SDNC_WEB_URL: https://odlux.oam.${HTTP_DOMAIN}
       SDNR_VES_COLLECTOR_ENABLED: true
       SDNR_VES_COLLECTOR_TLS_ENABLED: false
       SDNR_VES_COLLECTOR_TRUST_ALL_CERTS: true
@@ -92,7 +92,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.controller.entrypoints: websecure
-      traefik.http.routers.controller.rule: Host(`controller.dcn.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.controller.rule: Host(`controller.dcn.${HTTP_DOMAIN}`)
       traefik.http.routers.controller.tls: true
       traefik.http.services.controller.loadbalancer.server.port: ${SDNC_REST_PORT}
 
@@ -120,7 +120,7 @@ services:
     container_name: ves-collector
     hostname: ves-collector
     extra_hosts:
-      - "ves-collector.dcn.${SOLUTION_DOMAIN}:${HOST_IP}"
+      - "ves-collector.dcn.${HTTP_DOMAIN}:${HOST_IP}"
     healthcheck:
       test: curl -k -u ${VES_ENDPOINT_USERNAME}:${VES_ENDPOINT_PASSWORD} ${VES_ENDPOINT_PROTOCOL}://localhost:${VES_ENDPOINT_PORT} || exit 1
       start_period: 1s
@@ -135,7 +135,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.ves.entrypoints: websecure
-      traefik.http.routers.ves.rule: Host(`ves-collector.dcn.${SOLUTION_DOMAIN}`)
+      traefik.http.routers.ves.rule: Host(`ves-collector.dcn.${HTTP_DOMAIN}`)
       traefik.http.routers.ves.tls: true
       traefik.http.services.ves.loadbalancer.server.port: ${VES_ENDPOINT_PORT}
     networks: