From: elinuxhenrik Date: Mon, 27 Jul 2020 11:06:03 +0000 (+0200) Subject: Step version to 2.1.0 on master X-Git-Tag: 2.1.0~54^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1fe0985cf84ef6e66fbdc5735ccf9c65694864b6;p=nonrtric.git Step version to 2.1.0 on master Step new version on master after Bronze maintenance release. Change-Id: If09f874b5cbd0bb12c5e2013375f80b65fb2c697 Signed-off-by: elinuxhenrik --- diff --git a/docker-compose/nosdnc/docker-compose.yml b/docker-compose/nosdnc/docker-compose.yml index aa83c7ac..27e073c3 100644 --- a/docker-compose/nosdnc/docker-compose.yml +++ b/docker-compose/nosdnc/docker-compose.yml @@ -16,7 +16,7 @@ version: '3.0' services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0 container_name: policy-agent networks: default: diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml index 1b5a2969..3bb0bd8c 100644 --- a/docker-compose/sdnc/docker-compose.yml +++ b/docker-compose/sdnc/docker-compose.yml @@ -16,7 +16,7 @@ version: '3.0' services: policy-agent: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:2.1.0 container_name: policy-agent networks: default: @@ -85,7 +85,7 @@ services: max-file: "5" a1-controller: - image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller:2.0.0 + image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller:2.1.0 depends_on : - db container_name: a1-controller diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index 8abc92cc..b5fedc38 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -120,7 +120,7 @@ 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.0.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.1.0-SNAPSHOT` End-to-end call =============== diff --git a/policy-agent/README.md b/policy-agent/README.md index 649a2b54..490a94fa 100644 --- 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.0.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.1.0-SNAPSHOT To Run Policy Agent in Local: diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index 0dd6d03b..e1884fc0 100644 --- a/policy-agent/pom.xml +++ b/policy-agent/pom.xml @@ -31,7 +31,7 @@ org.o-ran-sc.nonrtric policy-agent - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 4cb5edf5..f7c5053c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc nonrtric - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom nonrtric diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml index 042e481f..3e112f0f 100644 --- a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml +++ b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml @@ -38,7 +38,7 @@ limitations under the License. org.o-ran-sc.nonrtric.sdnc-a1.northbound features-sdnc-a1-northbound - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT feature sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/features/installer/pom.xml b/sdnc-a1-controller/northbound/features/installer/pom.xml index 75e41f61..44c2dcae 100755 --- a/sdnc-a1-controller/northbound/features/installer/pom.xml +++ b/sdnc-a1-controller/northbound/features/installer/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound-features-installer - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/features/pom.xml b/sdnc-a1-controller/northbound/features/pom.xml index 39863639..b9fda712 100755 --- a/sdnc-a1-controller/northbound/features/pom.xml +++ b/sdnc-a1-controller/northbound/features/pom.xml @@ -30,7 +30,7 @@ limitations under the License. org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-northbound-feature-aggregator - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-northbound :: features diff --git a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml index 3a4d11ae..e4f0fc7a 100644 --- a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml +++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml @@ -38,7 +38,7 @@ limitations under the License. org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound-all - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT feature sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml index 4ec9ab65..87b05afd 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound features-nonrt-ric-api - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT feature sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml index 09ce5810..7ff8e6b8 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-features - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml index 895766d0..07d37874 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-nonrt-ric-api - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT feature sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml index 3a70a34f..3913f5ee 100755 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-installer - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml index 08fd4793..4403d42c 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml @@ -38,7 +38,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-model - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT bundle sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml index c24857f6..f4bf81c8 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml @@ -32,7 +32,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml index 8fa19ac0..88acea6a 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml @@ -40,7 +40,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-provider - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT bundle sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml index 1f950975..4589d0c1 100644 --- a/sdnc-a1-controller/northbound/pom.xml +++ b/sdnc-a1-controller/northbound/pom.xml @@ -38,7 +38,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml index 6cdf04f8..11b2bb80 100644 --- a/sdnc-a1-controller/oam/installation/pom.xml +++ b/sdnc-a1-controller/oam/installation/pom.xml @@ -30,7 +30,7 @@ pom org.o-ran-sc.nonrtric.sdnc-a1.oam installation - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT sdnc-a1-oam :: installation Installs SDN-C on local file system diff --git a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml index 2169344e..18d94cdd 100644 --- a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml +++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml @@ -30,17 +30,17 @@ pom org.o-ran-sc.nonrtric.sdnc-a1.oam installation-sdnc-a1 - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT sdnc-a1-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container o-ran-sc/nonrtric-a1-controller - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ${project.version} ${maven.build.timestamp} - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT 0.7.0 deploy diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml index 93121a7a..3e754a0e 100644 --- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml +++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml @@ -38,7 +38,7 @@ services: max-file: "5" a1-controller: - image: o-ran-sc/nonrtric-a1-controller:2.0.0-SNAPSHOT + image: o-ran-sc/nonrtric-a1-controller:2.1.0-SNAPSHOT depends_on : - db container_name: a1-controller-container diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml index 7e9030c3..ad283560 100644 --- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-installer - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-oam :: platform-logic :: ${project.artifactId} diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml index a9d8ca94..ceb37422 100644 --- a/sdnc-a1-controller/oam/platform-logic/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-oam :: platform-logic diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml index f4c62c5d..b3f67417 100644 --- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-setup - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-oam :: platform-logic :: ${project.artifactId} diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index 45105e60..d66503c8 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -29,7 +29,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam sdnc-a1-oam - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1-oam diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml index e15d7ef6..6f08d253 100644 --- a/sdnc-a1-controller/pom.xml +++ b/sdnc-a1-controller/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc.nonrtric.sdnc-a1 sdnc-a1 - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT pom sdnc-a1 diff --git a/test/common/test_env.sh b/test/common/test_env.sh index a06efe27..623bc247 100755 --- a/test/common/test_env.sh +++ b/test/common/test_env.sh @@ -25,10 +25,10 @@ # Local Policy Agent image and tag POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent" -POLICY_AGENT_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" +POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.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.0.0" +POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0" # Control Panel local image and tag @@ -41,10 +41,10 @@ CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0" # SDNC A1 Controller local image and tag SDNC_A1_CONTROLLER_LOCAL_IMAGE="o-ran-sc/nonrtric-a1-controller" -SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.0.0-SNAPSHOT" +SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller" -SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.0.0" +SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.1.0" #SDNC DB remote image and tag