Step versions on master

Change-Id: I932759a31af488af3cba69364f5842d145dcd881
Issue-ID: NONRTRIC-352
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

diff --git a/docker-compose/ecs/docker-compose.yml b/docker-compose/ecs/docker-compose.yml
index f7d2f77..8b64e25 100644 (file)
--- a/docker-compose/ecs/docker-compose.yml
+++ b/docker-compose/ecs/docker-compose.yml
@@ -22,7 +22,7 @@ networks:
 
 services:
   ecs:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0
     container_name: ecs
     networks:
       default:
@@ -33,7 +33,7 @@ services:
       - 8434:8434
 
   policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0
     container_name: policy-control-panel
     networks:
       - default

diff --git a/docker-compose/nosdnc/docker-compose.yml b/docker-compose/nosdnc/docker-compose.yml
index 4833403..c57cd29 100644 (file)
--- a/docker-compose/nosdnc/docker-compose.yml
+++ b/docker-compose/nosdnc/docker-compose.yml
@@ -22,7 +22,7 @@ networks:
 
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0
     container_name: policy-agent
     networks:
       default:
@@ -66,7 +66,7 @@ services:
       - ALLOW_HTTP=true
 
   policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0
     container_name: policy-control-panel
     networks:
       - default

diff --git a/docker-compose/rapp/docker-compose.yml b/docker-compose/rapp/docker-compose.yml
index 1e4763a..3265408 100644 (file)
--- a/docker-compose/rapp/docker-compose.yml
+++ b/docker-compose/rapp/docker-compose.yml
@@ -22,7 +22,7 @@ networks:
 
 services:
   r-app:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-r-app-catalogue:1.1.0
     container_name: r-app
     networks:
       default:

diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml
index 3f5410f..9796ece 100644 (file)
--- a/docker-compose/sdnc/docker-compose.yml
+++ b/docker-compose/sdnc/docker-compose.yml
@@ -22,7 +22,7 @@ networks:
 
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0
     container_name: policy-agent
     networks:
       default:
@@ -66,7 +66,7 @@ services:
       - ALLOW_HTTP=true
 
   policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0
     container_name: policy-control-panel
     networks:
       - default

diff --git a/docker-compose/withDmaap_nosdnc/docker-compose.yml b/docker-compose/withDmaap_nosdnc/docker-compose.yml
index 7259a4f..f2026b0 100644 (file)
--- a/docker-compose/withDmaap_nosdnc/docker-compose.yml
+++ b/docker-compose/withDmaap_nosdnc/docker-compose.yml
@@ -22,7 +22,7 @@ networks:
 
 services:
   policy-agent:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.2.0
     container_name: policy-agent
     networks:
       default:
@@ -67,7 +67,7 @@ services:
       - ALLOW_HTTP=true
 
   policy-control-panel:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel:2.2.0
     container_name: policy-control-panel
     networks:
       - default

diff --git a/docs/offeredapis/swagger/ecs-api.json b/docs/offeredapis/swagger/ecs-api.json
index 303a925..3684c0e 100644 (file)
--- a/docs/offeredapis/swagger/ecs-api.json
+++ b/docs/offeredapis/swagger/ecs-api.json
@@ -742,4 +742,4 @@
             "description": "Status Controller"
         }
     ]
-}
\ No newline at end of file
+}

diff --git a/enrichment-coordinator-service/pom.xml b/enrichment-coordinator-service/pom.xml
index f7d6e5e..d34c9a6 100644 (file)
--- a/enrichment-coordinator-service/pom.xml
+++ b/enrichment-coordinator-service/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>enrichment-coordinator-service</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>

diff --git a/policy-agent/README.md b/policy-agent/README.md
index 490a94f..d660df9 100644 (file)
--- a/policy-agent/README.md
+++ b/policy-agent/README.md
@@ -34,7 +34,7 @@ volumes:
 The target paths in the container should not be modified.
 
 Example docker run command for mounting new files (assuming they are located in the current directory):
-docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.1.0-SNAPSHOT
+docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.2.0-SNAPSHOT
 
 
 To Run Policy Agent in Local:

diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 41df80e..d18c9f7 100644 (file)
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>policy-agent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>

diff --git a/pom.xml b/pom.xml
index 92d50a6..d871709 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.o-ran-sc</groupId>
     <artifactId>nonrtric</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>nonrtric</name>

diff --git a/r-app-catalogue/pom.xml b/r-app-catalogue/pom.xml
index 110f2d0..a2e0565 100644 (file)
--- a/r-app-catalogue/pom.xml
+++ b/r-app-catalogue/pom.xml
@@ -31,7 +31,7 @@
     </parent>\r
     <groupId>org.o-ran-sc.nonrtric</groupId>\r
     <artifactId>r-app-catalogue</artifactId>\r
-    <version>1.0.0-SNAPSHOT</version>\r
+    <version>1.1.0-SNAPSHOT</version>\r
     <licenses>\r
         <license>\r
             <name>The Apache Software License, Version 2.0</name>\r

diff --git a/test/common/test_env.sh b/test/common/test_env.sh
index 293e993..a8e618f 100644 (file)
--- a/test/common/test_env.sh
+++ b/test/common/test_env.sh
@@ -25,24 +25,24 @@
 
 # Local Policy Agent image and tag
 POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent"
-POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT"
+POLICY_AGENT_LOCAL_IMAGE_TAG="2.2.0-SNAPSHOT"
 # Remote Policy Agent image and tag
 POLICY_AGENT_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent"
-POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0"
+POLICY_AGENT_REMOTE_IMAGE_TAG="2.2.0"
 
 # Local ECS image and tag
 ECS_LOCAL_IMAGE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_LOCAL_IMAGE_TAG="1.0.0-SNAPSHOT"
+ECS_LOCAL_IMAGE_TAG="1.1.0-SNAPSHOT"
 # Remote ECS image and tag
 ECS_REMOTE_IMAGE="nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_REMOTE_IMAGE_TAG="1.0.0-SNAPSHOT"
+ECS_REMOTE_IMAGE_TAG="1.1.0-SNAPSHOT"
 
 # Control Panel local image and tag
 CONTROL_PANEL_LOCAL_IMAGE="o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT"
+CONTROL_PANEL_LOCAL_IMAGE_TAG="2.2.0-SNAPSHOT"
 # Control Panel remote image and tag
 CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0"
+CONTROL_PANEL_REMOTE_IMAGE_TAG="2.2.0"
 
 
 # SDNC A1 Controller local image and tag