From 80bfd374189270c924d69332d282d459fdd6f47b Mon Sep 17 00:00:00 2001
From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Fri, 4 Feb 2022 17:30:41 +0200
Subject: [PATCH] Remove highstreet from simulated Network Functions names.

Issue-ID: OAM-247
Change-Id: I1f1a740a315bf0fc2a7cdc884ab6a166ea718017
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---
 solution/integration/network/config.py                       |  2 +-
 solution/integration/network/docker-compose.yml              | 12 ++++++------
 .../ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml    |  2 +-
 .../ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/solution/integration/network/config.py b/solution/integration/network/config.py
index f1fd0f3..30c4a39 100644
--- a/solution/integration/network/config.py
+++ b/solution/integration/network/config.py
@@ -25,7 +25,7 @@ import subprocess
 dockerFilter = subprocess.check_output("docker ps --format '{{.Names}}'", shell=True)
 containers = dockerFilter.splitlines()
 
-mapping = dict({"ntsim-ng-o-ru": "highstreet-O-RU", "ntsim-ng-o-du": "highstreet-O-DU"}) 
+mapping = dict({"ntsim-ng-o-ru": "O-RU", "ntsim-ng-o-du": "O-DU"})
 # base = 'https://sdnc-web:8453'
 base = 'https://localhost:8453'
 username = 'admin'
diff --git a/solution/integration/network/docker-compose.yml b/solution/integration/network/docker-compose.yml
index 8e0921d..711a915 100755
--- a/solution/integration/network/docker-compose.yml
+++ b/solution/integration/network/docker-compose.yml
@@ -64,7 +64,7 @@ services:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-du:${NTS_BUILD_VERSION}"
     container_name: ntsim-ng-o-du-1122
-    hostname: highstreet-O-DU-1122
+    hostname: O-DU-1122
     volumes:
         - ./ntsim-ng-o-du/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml:/opt/dev/deploy/data/o-ran-sc-du-hello-world-running.xml
@@ -77,7 +77,7 @@ services:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
     container_name: ntsim-ng-o-ru-fh-11221
-    hostname: highstreet-O-RU-11221
+    hostname: O-RU-11221
     volumes:
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-1/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-1/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
@@ -92,7 +92,7 @@ services:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
     container_name: ntsim-ng-o-ru-fh-11222
-    hostname: highstreet-O-RU-11222
+    hostname: O-RU-11222
     volumes:
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-2/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-2/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
@@ -107,7 +107,7 @@ services:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}nts-ng-o-ran-ru-fh:${NTS_BUILD_VERSION}"
     container_name: ntsim-ng-o-ru-fh-11223
-    hostname: highstreet-O-RU-11223
+    hostname: O-RU-11223
     volumes:
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-3/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-3/ietf-hardware-operational.json:/opt/dev/deploy/data/ietf-hardware-operational.json
@@ -122,7 +122,7 @@ services:
     <<: *common_nf
     image: "${NEXUS3_DOCKER_REPO}smo-nts-ng-topology-server:${NTS_BUILD_VERSION}"
     container_name: ntsim-ng-topology-server
-    hostname: highstreet-TAPI-topology-server
+    hostname: TAPI-topology-server
     volumes:
         - ./ntsim-ng-topology-server/config.json:/opt/dev/ntsim-ng/config/config.json
         - ./ntsim-ng-topology-server/tapi-common-operational.xml:/opt/dev/deploy/data/tapi-common-operational.xml
@@ -131,7 +131,7 @@ services:
         <<: *common_env
         <<: *topo_env
         SSH_CONNECTIONS: 1
-        TLS_CONNECTIONS: 0    
+        TLS_CONNECTIONS: 0
 networks:
     default:
         external:
diff --git a/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml b/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml
index 0bc12be..503cd79 100644
--- a/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml
+++ b/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml
@@ -6,7 +6,7 @@
     <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
     <location-name>address name</location-name>
     <distributed-unit-functions>
-      <id>O-DU-1211</id>
+      <id>O-DU-1122</id>
       <administrative-state>locked</administrative-state>
       <operational-state>enabled</operational-state>
       <user-label>o-du-1</user-label>
diff --git a/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml b/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml
index 2d7baf0..a6ca63a 100644
--- a/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml
+++ b/solution/integration/network/ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml
@@ -4,7 +4,7 @@
     <user-label>nf1</user-label>
     <distinguished-name-prefix>CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM</distinguished-name-prefix>
     <distributed-unit-functions>
-      <id>O-DU-1211</id>
+      <id>O-DU-1122</id>
       <administrative-state>unlocked</administrative-state>
       <user-label>o-du-1</user-label>
       <cell>
-- 
2.16.6