Update installation and CSAR file names

SME file names in CSAR updated.
Installation script updated to include rAppmanager and Dme Participant

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

diff --git a/csar-generator/resources/Files/Sme/providers/gateway-provider-function.json b/csar-generator/resources/Files/Sme/providers/gateway-provider-function.json
deleted file mode 100755 (executable)
index fae856a..0000000
--- a/csar-generator/resources/Files/Sme/providers/gateway-provider-function.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "apiProvDomInfo": "provider domain Gateway as entrypoint AEF",
-  "apiProvFuncs": [
-    {
-      "apiProvFuncInfo": "Gateway as entrypoint AEF",
-      "apiProvFuncRole": "AEF",
-      "regInfo": {
-        "apiProvPubKey": "AEF-Gateway-PublicKey"
-      }
-    }
-  ],
-  "regSec": "PSK"
-}
\ No newline at end of file

diff --git a/csar-generator/resources/Files/Sme/providers/aef-provider-function.json b/csar-generator/resources/Files/Sme/providers/provider-function-1.json
similarity index 54%
rename from csar-generator/resources/Files/Sme/providers/aef-provider-function.json
rename to csar-generator/resources/Files/Sme/providers/provider-function-1.json
index 644819c..a2ea1c8 100755 (executable)
--- a/csar-generator/resources/Files/Sme/providers/aef-provider-function.json
+++ b/csar-generator/resources/Files/Sme/providers/provider-function-1.json
@@ -14,20 +14,6 @@
       "regInfo": {
         "apiProvPubKey": "AEF-PublicKey"
       }
-    },
-    {
-      "apiProvFuncInfo": "rApp as AMF",
-      "apiProvFuncRole": "AMF",
-      "regInfo": {
-        "apiProvPubKey": "AMF-PublicKey"
-      }
-    },
-    {
-      "apiProvFuncInfo": "Gateway as entrypoint AEF",
-      "apiProvFuncRole": "AEF",
-      "regInfo": {
-        "apiProvPubKey": "AEF-Gateway-PublicKey"
-      }
     }
   ],
   "regSec": "PSK"

diff --git a/csar-generator/resources/Files/Sme/providers/apf-provider-function.json b/csar-generator/resources/Files/Sme/providers/provider-function-2.json
similarity index 100%
rename from csar-generator/resources/Files/Sme/providers/apf-provider-function.json
rename to csar-generator/resources/Files/Sme/providers/provider-function-2.json

diff --git a/csar-generator/resources/Files/Sme/providers/amf-provider-function.json b/csar-generator/resources/Files/Sme/providers/provider-function-3.json
similarity index 100%
rename from csar-generator/resources/Files/Sme/providers/amf-provider-function.json
rename to csar-generator/resources/Files/Sme/providers/provider-function-3.json

diff --git a/scripts/install/install-nonrtric.sh b/scripts/install/install-nonrtric.sh
index bd66a43..4595f64 100755 (executable)
--- a/scripts/install/install-nonrtric.sh
+++ b/scripts/install/install-nonrtric.sh
@@ -2,6 +2,7 @@
 
 #  ============LICENSE_START===============================================
 #  Copyright (C) 2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023 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.
@@ -21,7 +22,7 @@ echo "######### Installing NONRTRIC components #########"
 
 git clone "https://gerrit.o-ran-sc.org/r/it/dep"
 
-ENABLED_SERVICES=(installPms installA1controller installA1simulator installInformationservice)
+ENABLED_SERVICES=(installPms installA1controller installA1simulator installInformationservice installrAppmanager installDmeParticipant)
 DISABLED_SERVICES=(installControlpanel installRappcatalogueservice installRappcatalogueenhancedservice installNonrtricgateway installKong installDmaapadapterservice installDmaapmediatorservice installHelmmanager installOrufhrecovery installRansliceassurance installRanpm)
 
 RECEIPE_FILE="dep/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml"