From: aravind.est <aravindhan.a@est.tech>
Date: Fri, 23 Feb 2024 13:55:16 +0000 (+0000)
Subject: Update the env variable and documentation
X-Git-Tag: 0.1.0~24
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F12570%2F1;p=nonrtric%2Fplt%2Frappmanager.git

Update the env variable and documentation

Env variable for chart museum and documentation updated.

Issue-ID: NONRTRIC-984
Change-Id: I2ec1eb60ef3b472ae4a5a85509a927a1b54aa524
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---

diff --git a/docs/images/rApp-flow.png b/docs/images/rApp-flow.png
index 9da4306..0b5e484 100755
Binary files a/docs/images/rApp-flow.png and b/docs/images/rApp-flow.png differ
diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 0e629da..5ccfb1d 100755
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+.. Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved.
 
 Installation Guide
 ==================
@@ -37,9 +37,14 @@ In case some of the installation is already setup or not set by the installation
 +--------------------+--------------------------------------------+----------------------------------------------+
 | **Variable Name**  | **Description**                            | **Default Value**                            |
 +--------------------+--------------------------------------------+----------------------------------------------+
-| CHART_REPO_HOST    | Address of the chart repository.           | \http://IP_ADDRESS:8879/charts               |
+| CHART_REPO_GET_URI | URI to get the charts.                     | \http://IP_ADDRESS:8879/charts               |
 |                    |                                            |                                              |
-|                    | It will be used by Kubernetes participant. | IP_ADDRESS: IP of the host in which          |
+|                    | It will be used by Kubernetes participant  | IP_ADDRESS: IP of the host in which          |
+|                    | and sample rApp generator                  | the installation scripts are running.        |
++--------------------+--------------------------------------------+----------------------------------------------+
+| CHART_REPO_POST_URI| URI to upload the charts.                  | \http://IP_ADDRESS:8879/charts/api/charts    |
+|                    |                                            |                                              |
+|                    | It will be used by sample rApp generator   | IP_ADDRESS: IP of the host in which          |
 |                    |                                            | the installation scripts are running.        |
 +--------------------+--------------------------------------------+----------------------------------------------+
 | A1PMS_HOST         | Address of the A1PMS.                      | \http://policymanagementservice.nonrtric:9080|
diff --git a/docs/uml/rApp-flow.puml b/docs/uml/rApp-flow.puml
index 765af4d..825bdfc 100755
--- a/docs/uml/rApp-flow.puml
+++ b/docs/uml/rApp-flow.puml
@@ -4,6 +4,7 @@ autonumber
 actor "API User"
 participant "rApp Manager"
 collections "File System"
+participant "Chartmuseum Server"
 participant "ACM Runtime"
 participant "DME"
 
@@ -13,6 +14,8 @@ group Create rApp
 "rApp Manager"->"File System": Store rApp Package
 "rApp Manager"->"API User": Create rApp Status
 "API User"->"rApp Manager": Prime rApp
+"rApp Manager"->"Chartmuseum Server": Upload helm charts
+"Chartmuseum Server"->"rApp Manager": Upload helm charts Status
 "rApp Manager"->"ACM Runtime": Create ACM composition
 "ACM Runtime"->"rApp Manager": Create ACM composition Status
 "rApp Manager"->"ACM Runtime": Prime ACM composition
diff --git a/scripts/install/install-acm.sh b/scripts/install/install-acm.sh
index 9c74142..491c1de 100755
--- a/scripts/install/install-acm.sh
+++ b/scripts/install/install-acm.sh
@@ -29,11 +29,11 @@ K8S_CONFIGURATION_FILE="docker/helm/policy/components/policy-clamp-ac-k8s-ppnt/v
 K8S_VERSIONS_FILE="docker/compose/get-k8s-versions.sh"
 KAFKA_DIR="docker/helm/cp-kafka"
 
-IP_ADDRESS=$(hostname -I | awk '{print $1}')
+IP_ADDRESS=$(hostname -I | sort -n -t . -k 1,1 -k 2,2 -k 3,3 -k 4,4 | awk '{print $1}')
 echo "IP Address : $IP_ADDRESS"
 
 A1PMS_HOST=${A1PMS_HOST:-http://policymanagementservice.nonrtric:9080}
-CHART_REPO_HOST=${CHART_REPO_HOST:-'http://'$IP_ADDRESS':8879/charts'}
+CHART_REPO_GET_URI=${CHART_REPO_GET_URI:-'http://'$IP_ADDRESS':8879/charts'}
 
 function wait_for_pods_to_be_running() {
     while [[ $TIME -lt 2000 ]]; do
@@ -86,7 +86,7 @@ echo "Updating A1PMS Participant"
 yq eval '.a1pms.baseUrl="'$A1PMS_HOST'"' -i $A1PMS_CONFIGURATION_FILE
 
 echo "Updating the k8s participant repo list"
-yq eval '.repoList.helm.repos += {"repoName":"local","address":"'$CHART_REPO_HOST'"}' -i $K8S_CONFIGURATION_FILE
+yq eval '.repoList.helm.repos += {"repoName":"local","address":"'$CHART_REPO_GET_URI'"}' -i $K8S_CONFIGURATION_FILE
 
 echo "Building policy helm charts..."
 helm dependency build docker/helm/policy/