Merge "Uplift of springboot framework"

diff --git a/helm-manager/README.md b/helm-manager/README.md
index c80bebe..0e49e92 100644 (file)
--- a/helm-manager/README.md
+++ b/helm-manager/README.md
@@ -1,3 +1,10 @@
+# O-RAN-SC Non-RT RIC Helm Manager
+
+The O-RAN Non-RT RIC Helm Manager provides a service to manages application helm charts.
+
+For further details and build and run, see this page [NONRTRIC Development Guide](https://wiki.o-ran-sc.org/display/RICNR/NONRTRIC+Development+Guide) for instructions of the applicable release.
+
+
 ## License
 Copyright (C) 2021 Nordix Foundation.
 Licensed under the Apache License, Version 2.0 (the "License")
@@ -12,12 +19,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-For more information about license please see the [LICENSE](LICENSE.txt) file for details.
-
-## Helm Manager for Kubernetes
-The helm manager is a service for managing helm charts.  The service provides a REST API for onboarding of charts as well as installation and uninstallation of applications based on these charts.
-
-```bash
-$ helm package charts
-$ helm install helmmanager helmmanager-2.0.0.tgz --namespace nonrtric -f overridefile.yaml
-```
\ No newline at end of file
+For more information about license please see the [LICENSE](LICENSE.txt) file for details.
\ No newline at end of file

diff --git a/test/common/test_env-oran-d-release.sh b/test/common/test_env-oran-d-release.sh
index 0f722b3..77907d3 100755 (executable)
--- a/test/common/test_env-oran-d-release.sh
+++ b/test/common/test_env-oran-d-release.sh
@@ -60,10 +60,10 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO
 
 # Policy Agent base image and tags
 POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent"
-POLICY_AGENT_IMAGE_TAG_LOCAL="2.2.0-SNAPSHOT"
-POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-SNAPSHOT"
-POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.0"
-POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.0"
+POLICY_AGENT_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT"
+POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-SNAPSHOT"
+POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.1"
+POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.1"
 
 # ECS image and tags
 ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
@@ -390,6 +390,7 @@ CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=
 CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11"         # nginx resolver for docker
 CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/"           # Path prefix for forwarding policy calls to NGW
 CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/"          # Path prefix for forwarding ecs calls to NGW
+CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/"         # Path prefix for forwarding ecs calls to NGW
 
 NRT_GATEWAY_APP_NAME="nonrtricgateway"                   # Name of the Gateway container
 NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway"

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 702fbf8..7b1201d 100755 (executable)
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -1228,8 +1228,11 @@ setup_testenvironment() {
                echo -e $RED"One or more images could not be pulled or containers using the images could not be stopped/removed"$ERED
                echo -e $RED"Or local image, overriding remote image, does not exist"$ERED
                if [ $IMAGE_CATEGORY == "DEV" ]; then
-                       echo -e $RED"Note that SNAPSHOT images may be purged from nexus after a certain period."$ERED
-                       echo -e $RED"In that case, switch to use a released image instead."$ERED
+                   echo ""
+                       echo -e $RED"Note that SNAPSHOT and staging images may be purged from nexus after a certain period."$ERED
+                       echo -e $RED"In addition, the image may not have been updated in the current release so no SNAPSHOT or staging image exists"$ERED
+                       echo -e $RED"In these cases, switch to use a released image instead, use the flag '--use-release-image <App-short-name>'"$ERED
+                       echo -e $RED"Use the 'App-short-name' for the applicable image from the above table: 'Images configured for start arg'."$ERED
                fi
                echo "#################################################################################################"
                echo ""