From: aravind.est <aravindhan.a@est.tech>
Date: Tue, 20 Feb 2024 14:28:48 +0000 (+0000)
Subject: Update chart repo url from installation script
X-Git-Tag: 0.1.0~26
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=inline;h=4526832bbc18aedfe78d4359c6b058f72c458b81;p=nonrtric%2Fplt%2Frappmanager.git

Update chart repo url from installation script

String based replacement added to add the proper chartmuseum urls in the configuration.

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

diff --git a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar
index a0aa3b2..4856dab 100755
Binary files a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar and b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-application/src/test/resources/valid-rapp-package.csar b/rapp-manager-application/src/test/resources/valid-rapp-package.csar
index 667317e..526d5d9 100755
Binary files a/rapp-manager-application/src/test/resources/valid-rapp-package.csar and b/rapp-manager-application/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar
index 1ab8ff9..f51cfb2 100755
Binary files a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar and b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar differ
diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar
index 1b96b0b..3454443 100755
Binary files a/rapp-manager-dme/src/test/resources/valid-rapp-package.csar and b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
index 41c0eaf..1babdd2 100755
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
@@ -67,7 +67,7 @@ public class RappCsarConfigurationHandler {
     public String getInstantiationPayload(Rapp rapp, RappACMInstance rappACMInstance, UUID compositionId) {
         return getPayload(rapp,
                 getResourceUri(RappCsarPathProvider.ACM_INSTANCES_LOCATION, rappACMInstance.getInstance())).replaceAll(
-                "COMPOSITIONID", String.valueOf(compositionId));
+                "DO_NOT_CHANGE_THIS_COMPOSITION_ID", String.valueOf(compositionId));
     }
 
     public ByteArrayResource getArtifactPayload(Rapp rapp, String location) {
diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar
index e614a19..e146e59 100755
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar differ
diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar
index d56f4ef..c82fce6 100755
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar differ
diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-acm-composition.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-acm-composition.csar
index d986fb4..30a7f04 100755
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-acm-composition.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-acm-composition.csar differ
diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar
index a2168ff..dade078 100755
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar differ
diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar
index 7ba7c33..e03ad3a 100755
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar differ
diff --git a/rapp-manager-models/src/test/resources/valid-rapp-package.csar b/rapp-manager-models/src/test/resources/valid-rapp-package.csar
index 667317e..a045a6a 100755
Binary files a/rapp-manager-models/src/test/resources/valid-rapp-package.csar and b/rapp-manager-models/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-sme/src/test/resources/valid-rapp-package.csar b/rapp-manager-sme/src/test/resources/valid-rapp-package.csar
index 2bbc2ef..e1c17c6 100755
Binary files a/rapp-manager-sme/src/test/resources/valid-rapp-package.csar and b/rapp-manager-sme/src/test/resources/valid-rapp-package.csar differ
diff --git a/sample-rapp-generator/rapp-all/Definitions/asd.yaml b/sample-rapp-generator/rapp-all/Definitions/asd.yaml
index 96543b8..af7e64f 100755
--- a/sample-rapp-generator/rapp-all/Definitions/asd.yaml
+++ b/sample-rapp-generator/rapp-all/Definitions/asd.yaml
@@ -16,7 +16,7 @@ topology_template:
         descriptor_version: 1.0
         schema_version: 2.0
         function_description: rApp description
-        provider: EST
+        provider: Ericsson Software Technology (O-RAN SC NONRTRIC team)
         application_name: rapp-all
         application_version: 1.0
       artifacts:
@@ -26,7 +26,7 @@ topology_template:
           properties:
             artifact_type: "helm_chart"
             target_server: "chartmuseum"
-            target_server_uri: "http://10.101.0.106:8879/charts/api/charts"
+            target_server_uri: "UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI"
             item_id: 1
         oru-app:
           type: tosca.artifacts.asd.deploymentItem
@@ -34,5 +34,5 @@ topology_template:
           properties:
             artifact_type: "helm_chart"
             target_server: "chartmuseum"
-            target_server_uri: "http://10.101.0.106:8879/charts/api/charts"
+            target_server_uri: "UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI"
             item_id: 2
\ No newline at end of file
diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json
index fa5d207..2918173 100755
--- a/sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json
+++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "A1PMSInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance 0",
   "elements": {
     "709c62b3-8918-41b9-a747-d21eb79c6c12": {
diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json
index 20d9a88..4491148 100755
--- a/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json
+++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "AllInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance",
   "elements": {
     "709c62b3-8918-41b9-a747-d21eb79c6c12": {
@@ -42,7 +42,7 @@
           "podName": "ransliceassurance",
           "repository": {
             "repoName": "local",
-            "address": "http://10.101.2.41:8879/charts"
+            "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI"
           }
         }
       }
diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json
index 562b5a2..b4416fb 100755
--- a/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json
+++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "DemoInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance 0",
   "elements": {
     "709c62b3-8918-41b9-a747-d21eb79c6c21": {
@@ -22,7 +22,7 @@
           "podName": "ransliceassurance",
           "repository": {
             "repoName": "local",
-            "address": "http://10.101.2.41:8879/charts"
+            "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI"
           }
         }
       }
diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json
index aaf63a1..e0b1b36 100755
--- a/sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json
+++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "KserveInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance 0",
   "elements": {
     "709c62b3-8918-41b9-a747-d21eb79c6c20": {
diff --git a/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta b/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
index ed2919e..3da5f0d 100755
--- a/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
+++ b/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
@@ -1,5 +1,5 @@
 TOSCA-Meta-File-Version: 1.0
 CSAR-Version: 1.0
-Created-By: EST
+Created-By: Ericsson Software Technology (O-RAN SC NONRTRIC team)
 Entry-Definitions: Definitions/asd.yaml
 ETSI-Entry-Manifest: asd.mf
\ No newline at end of file
diff --git a/sample-rapp-generator/rapp-hello-world/Definitions/asd.yaml b/sample-rapp-generator/rapp-hello-world/Definitions/asd.yaml
index 2968ce8..810455a 100644
--- a/sample-rapp-generator/rapp-hello-world/Definitions/asd.yaml
+++ b/sample-rapp-generator/rapp-hello-world/Definitions/asd.yaml
@@ -43,4 +43,6 @@ topology_template:
           file: "Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz"
           properties:
             artifact_type: "helm_chart"
-            itemId: 1
+            target_server: "chartmuseum"
+            target_server_uri: "UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI"
+            item_id: 1
diff --git a/sample-rapp-generator/rapp-hello-world/Definitions/asd_types.yaml b/sample-rapp-generator/rapp-hello-world/Definitions/asd_types.yaml
index 237ccfd..c4de6ad 100644
--- a/sample-rapp-generator/rapp-hello-world/Definitions/asd_types.yaml
+++ b/sample-rapp-generator/rapp-hello-world/Definitions/asd_types.yaml
@@ -77,3 +77,14 @@ tosca.artifacts.asd.deploymentItem:
       type: string
       constraints:
         - valid_values: ["helm_chart"]
+    target_server:
+      description: >
+        Specify target server for artifact.
+      required: true
+      type: string
+      constraints:
+        - valid_values: [ "chartmuseum" ]
+    target_server_uri:
+      description: "URI of the target server"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json
index 734f0d1..c019541 100644
--- a/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json
+++ b/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "K8DemoInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance 0",
   "elements": {
     "d7be552e-bcc5-4478-b64d-797dbaec8f55": {
@@ -22,7 +22,7 @@
           "podName": "hello-world-chart",
           "repository": {
             "repoName": "local",
-            "address": "http://10.101.1.90:8879/charts"
+            "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI"
           }
         }
       }
diff --git a/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml b/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml
index 237ccfd..c4de6ad 100644
--- a/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml
+++ b/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml
@@ -77,3 +77,14 @@ tosca.artifacts.asd.deploymentItem:
       type: string
       constraints:
         - valid_values: ["helm_chart"]
+    target_server:
+      description: >
+        Specify target server for artifact.
+      required: true
+      type: string
+      constraints:
+        - valid_values: [ "chartmuseum" ]
+    target_server_uri:
+      description: "URI of the target server"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json b/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json
index 09a5759..9086d8c 100644
--- a/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json
+++ b/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json
@@ -1,7 +1,7 @@
 {
   "name": "DemoKserveInstance0",
   "version": "1.0.1",
-  "compositionId": "COMPOSITIONID",
+  "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID",
   "description": "Demo automation composition instance 0",
   "elements": {
     "709c62b3-8918-41b9-a747-d21eb79c6c20": {
diff --git a/scripts/install/install-all.sh b/scripts/install/install-all.sh
index a8c518a..fa59b3d 100755
--- a/scripts/install/install-all.sh
+++ b/scripts/install/install-all.sh
@@ -34,4 +34,7 @@ echo "Installing ACM components..."
 echo "Patching Kserve..."
 ./patch-kserve.sh
 
+echo "Patching Sample rApps..."
+./patch-sample-rapps.sh
+
 echo "Rapp Manager installation completed."
\ No newline at end of file
diff --git a/scripts/install/patch-sample-rapps.sh b/scripts/install/patch-sample-rapps.sh
new file mode 100755
index 0000000..0dfa922
--- /dev/null
+++ b/scripts/install/patch-sample-rapps.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+#  ============LICENSE_START===============================================
+#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+#  ========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+#  ============LICENSE_END=================================================
+#
+
+echo "######### Patching Sample rApps #########"
+
+CWD=$(pwd)
+export WORKSPACE="$CWD/../../sample-rapp-generator"
+
+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"
+
+CHART_REPO_GET_URI=${CHART_REPO_GET_URI:-'http://'$IP_ADDRESS':8879/charts'}
+CHART_REPO_POST_URI=${CHART_REPO_POST_URI:-'http://'$IP_ADDRESS':8879/charts/api/charts'}
+
+echo "Replacing charts repo post url in yaml files....."
+echo "Chart repository post URI : $CHART_REPO_POST_URI"
+for file in $(find $WORKSPACE -type f -name "*.yaml"); do
+  sed -i "s|UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI|${CHART_REPO_POST_URI}|g" "$file"
+  if grep -q "$CHART_REPO_POST_URI" "$file"; then
+    echo "$file is updated."
+  fi
+done
+
+echo "Replacing charts repo get url in json files....."
+echo "Chart repository get URI : $CHART_REPO_GET_URI"
+for file in $(find $WORKSPACE -type f -name "*.json"); do
+  sed -i "s|UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI|${CHART_REPO_GET_URI}|g" "$file"
+  if grep -q "$CHART_REPO_GET_URI" "$file"; then
+    echo "$file is updated."
+  fi
+done
+
+echo "Patching Sample rApps completed."