From 350e5f7b0496801bc50ec5c12c6f8f0f2c02ba8e Mon Sep 17 00:00:00 2001
From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Tue, 21 Mar 2023 16:35:14 +0200
Subject: [PATCH] Add extra_hosts to the docker-compose files.

Issue-ID: OAM-319
Change-Id: I263e78cc32d9b2fe23557279d434a6f8410efc71
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---
 solution/network/.env               | 4 +++-
 solution/network/docker-compose.yml | 4 ++++
 solution/smo/oam/.env               | 4 +++-
 solution/smo/oam/docker-compose.yml | 4 +++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/solution/network/.env b/solution/network/.env
index 6888fa6..03600dd 100644
--- a/solution/network/.env
+++ b/solution/network/.env
@@ -32,7 +32,7 @@ VES_COLLECTOR_OAM_HOST=ves-collector.oam.smo.o-ran-sc.org
 # NTS NG settings
 NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/
 NTS_MANAGER_PORT=8300
-NTS_BUILD_VERSION=1.5.2
+NTS_BUILD_VERSION=1.6.1
 
 IPv6_ENABLED=true
 SSH_CONNECTIONS=1
@@ -56,3 +56,5 @@ VES_ENDPOINT_PORT=443
 VES_ENDPOINT_AUTH_METHOD=basic-auth
 VES_ENDPOINT_USERNAME=sample1
 VES_ENDPOINT_PASSWORD=sample1
+
+HOST_IP=AA.BB.CC.DD
diff --git a/solution/network/docker-compose.yml b/solution/network/docker-compose.yml
index 7ad9a40..6a29fa3 100755
--- a/solution/network/docker-compose.yml
+++ b/solution/network/docker-compose.yml
@@ -56,6 +56,10 @@ x-topo-env: &topo_env
 
 x-nf: &common_nf
     stop_grace_period: 5m
+    extra_hosts:
+      - "identity.smo.o-ran-sc.org:${HOST_IP}"
+      - "controller.oam.smo.o-ran-sc.org:${HOST_IP}"
+      - "ves-collector.oam.smo.o-ran-sc.org:${HOST_IP}"
     cap_add:
     - SYS_ADMIN
     - SYS_PTRACE
diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env
index c410a2a..9ad6728 100644
--- a/solution/smo/oam/.env
+++ b/solution/smo/oam/.env
@@ -52,4 +52,6 @@ VES_ENDPOINT_PROTOCOL=http
 VES_ENDPOINT_PORT=8080
 VES_ENDPOINT_AUTH_METHOD=basic-auth
 VES_ENDPOINT_USERNAME=sample1
-VES_ENDPOINT_PASSWORD=sample1
\ No newline at end of file
+VES_ENDPOINT_PASSWORD=sample1
+
+HOST_IP=AA.BB.CC.DD
diff --git a/solution/smo/oam/docker-compose.yml b/solution/smo/oam/docker-compose.yml
index 9d2c5b5..a052e95 100755
--- a/solution/smo/oam/docker-compose.yml
+++ b/solution/smo/oam/docker-compose.yml
@@ -28,6 +28,8 @@ services:
     image: ${SDNC_IMAGE}
     container_name: controller
     hostname: controller
+    extra_hosts:
+      - "identity.smo.o-ran-sc.org:${HOST_IP}"
     healthcheck:
       test: wget -U ${ADMIN_USERNAME}:${ADMIN_PASSWORD} --no-verbose --tries=1 --spider http://localhost:${SDNC_REST_PORT}/ready || exit 1
       start_period: 60s
@@ -111,4 +113,4 @@ networks:
       driver: default
       config:
       - subnet:  "${NETWORK_SUBNET_OAM_IPv6}"
-        gateway: "${NETWORK_GATEWAY_OAM_IPv6}"
\ No newline at end of file
+        gateway: "${NETWORK_GATEWAY_OAM_IPv6}"
-- 
2.16.6