Merge changes I858320af,I05b8456d

* changes:
  SMO-Install: Standalone NONRTRIC installation mode added
  SMO-Install: A1 PMS config correction and simulator URL update in charts

diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
index 47f3ea6..291dfee 100755 (executable)
--- a/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@ -112,7 +112,7 @@ for component in $COMPONENTS; do
     helm dep up $ROOT_DIR/../nonrtric/helm/$component
     VERSION=$(cat $ROOT_DIR/../nonrtric/helm/$component/Chart.yaml | grep version | awk '{print $2}')
     helm package -d /tmp $ROOT_DIR/../nonrtric/helm/$component
-    cp /tmp/$component-$VERSION.tgz ${HELM_LOCAL_REPO}
+    curl --data-binary @/tmp/$component-$VERSION.tgz http://127.0.0.1:8879/charts/api/charts
 done
 
 helm dep up $ROOT_DIR/../nonrtric/helm/nonrtric

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index b649440..6e3b84e 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -326,7 +326,7 @@ orufhrecovery:
     imagePullPolicy: IfNotPresent
     image:
       registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
-      name: "nonrtric-rapp-orufhrecovery"
+      name: "nonrtric-rapp-orufhrecovery-consumer"
       tag: 1.1.0
     env:
       consumer_host: "http://mrproducer"