From: elinuxhenrik Date: Fri, 24 Jul 2020 13:10:46 +0000 (+0200) Subject: Step version to 2.0.1 X-Git-Tag: 2.0.1~10 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F4449%2F1;p=nonrtric.git Step version to 2.0.1 Change-Id: Iafc37a79852762df3fb5bb85cc5b43a51f82c6de Signed-off-by: elinuxhenrik --- diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index ffb5dc07..e3ab2235 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.0.1-SNAPSHOT` End-to-end call =============== diff --git a/policy-agent/README.md b/policy-agent/README.md index 649a2b54..539ee55e 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.0.1-SNAPSHOT To Run Policy Agent in Local: diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index 8f56cd64..6f362356 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.0.1-SNAPSHOT The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 4cb5edf5..cb04b408 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc nonrtric - 2.0.0-SNAPSHOT + 2.0.1-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..24216ff5 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.0.1-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..c9c354ba 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.0.1-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..87387cab 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.0.1-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..8f3787fa 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.0.1-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..bdeddf59 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.0.1-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..7c73ba32 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.0.1-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..799819d4 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.0.1-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..7305a218 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.0.1-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..19b5005c 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.0.1-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..345cb298 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.0.1-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..d6a4b76d 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.0.1-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..4896c7a6 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.0.1-SNAPSHOT pom diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml index 6cdf04f8..5e1e598a 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.0.1-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 b8816ece..428997c3 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.0.1-SNAPSHOT sdnc-a1-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container o-ran-sc/nonrtric-a1-controller - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT ${project.version} ${maven.build.timestamp} - 2.0.0-SNAPSHOT + 2.0.1-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..95d4d6b3 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.0.1-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..3e0865e5 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.0.1-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..f44f66a6 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.0.1-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..8266de17 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.0.1-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..6c3a2615 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.0.1-SNAPSHOT pom sdnc-a1-oam diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml index e15d7ef6..3829d391 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.0.1-SNAPSHOT pom sdnc-a1 diff --git a/test/common/test_env.sh b/test/common/test_env.sh index a06efe27..a82c5c8e 100755 --- a/test/common/test_env.sh +++ b/test/common/test_env.sh @@ -25,7 +25,7 @@ # 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.0.1-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" @@ -33,7 +33,7 @@ POLICY_AGENT_REMOTE_IMAGE_TAG="2.0.0" # 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.0.1-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" @@ -41,7 +41,7 @@ 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.0.1-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"