Merge "update from stating to released"

diff --git a/solution/dev/.env b/solution/dev/.env
index a51149c..d9a01f1 100644 (file)
--- a/solution/dev/.env
+++ b/solution/dev/.env
@@ -53,7 +53,7 @@ VES_COLLECTOR_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.
 VES_COLLECTOR_IP=172.40.0.27
 
 ## NTS NG settings
-DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/
+DOCKER_REPO=nexus3.o-ran-sc.org:10002/o-ran-sc/
 NTS_MANAGER_PORT=8300
 NTS_BUILD_VERSION=1.3.1
 

diff --git a/solution/integration/network/.env b/solution/integration/network/.env
index 4929cc9..f382b3d 100644 (file)
--- a/solution/integration/network/.env
+++ b/solution/integration/network/.env
@@ -29,7 +29,7 @@ VES_COLLECTOR_OAM_IPv6=2001:db8:1:50::27
 
 # NTS NG settings
 PUBLIC_DOCKER_REPO=docker.io/hightec/
-NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/
+NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10002/o-ran-sc/
 NTS_MANAGER_PORT=8300
 NTS_BUILD_VERSION=1.3.3
 

diff --git a/solution/integration/smo/common/docker/README.md b/solution/integration/smo/common/docker/README.md
index a36804f..814084d 100644 (file)
--- a/solution/integration/smo/common/docker/README.md
+++ b/solution/integration/smo/common/docker/README.md
@@ -12,7 +12,7 @@ https://docs.docker.com/config/daemon/ipv6/
 {
   "dns": ["1.1.1.1"],
   "registry-mirrors": [
-      "https://nexus3.o-ran-sc.org:10004", 
+      "https://nexus3.o-ran-sc.org:10002", 
       "https://nexus3.onap.org:10001"
   ],
   "log-driver": "json-file",

diff --git a/solution/integration/smo/common/docker/daemon.json b/solution/integration/smo/common/docker/daemon.json
index 1573447..bed1ae3 100644 (file)
--- a/solution/integration/smo/common/docker/daemon.json
+++ b/solution/integration/smo/common/docker/daemon.json
@@ -1,7 +1,7 @@
 {
   "dns": ["1.1.1.1"],
   "registry-mirrors": [
-    "https://nexus3.o-ran-sc.org:10004",
+    "https://nexus3.o-ran-sc.org:10002",
     "https://nexus3.onap.org:10001"
   ],
   "log-driver": "json-file",

diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml
index df88b75..c204740 100644 (file)
--- a/solution/integration/smo/non-rt-ric/docker-compose.yml
+++ b/solution/integration/smo/non-rt-ric/docker-compose.yml
@@ -25,7 +25,7 @@ networks:
 
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-policy-agent:2.2.0
     container_name: policy-agent
     networks:
       - default
@@ -43,7 +43,7 @@ services:
     #  - ./config/pms/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro
 
   a1-sim-OSC:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0
     container_name: a1-sim-OSC
     networks:
       - default
@@ -58,7 +58,7 @@ services:
       - ALLOW_HTTP=true
 
   a1-sim-STD:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0
     container_name: a1-sim-STD
     networks:
       - default
@@ -73,7 +73,7 @@ services:
       - ALLOW_HTTP=true
 
   a1-sim-STD-v2:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator:2.1.0
     container_name: a1-sim-STD-v2
     networks:
       - default
@@ -88,7 +88,7 @@ services:
       - ALLOW_HTTP=true
 
   r-app:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.1.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-r-app-catalogue:1.1.0
     container_name: r-app
     networks:
       - default
@@ -97,7 +97,7 @@ services:
       - 8633:8633
 
   policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-controlpanel:2.2.0
     container_name: policy-control-panel
     networks:
       - default
@@ -108,7 +108,7 @@ services:
       - ./config/control-panel/nginx.conf:/etc/nginx/nginx.conf:ro
 
   nonrtric-gateway:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-gateway:1.0.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway:1.0.0
     container_name: nonrtric-gateway
     networks:
       - default
@@ -118,7 +118,7 @@ services:
       - ./config/nonrtric-gateway/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro
 
   ecs:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0
     container_name: ecs
     networks:
       - default
@@ -135,7 +135,7 @@ services:
       - 8088:80
 
   oru-app:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-o-ru-closed-loop-recovery:1.0.0
+    image: nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-ru-closed-loop-recovery:1.0.0
     container_name: oru-app
     networks:
       - default