X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bin%2Fdeploy-ric-aux;h=1d8ba538f9f4250f9fd4f0217395e7a369c2b0a8;hb=e4d2f4b90f4045519b1957b37416e163a3079da7;hp=5ccb386bc890b02beac788422b14f9f2d3fb77f9;hpb=7f1e409379856025977fc8a6ea04ddb215f21a13;p=it%2Fdep.git

diff --git a/bin/deploy-ric-aux b/bin/deploy-ric-aux
index 5ccb386b..1d8ba538 100755
--- a/bin/deploy-ric-aux
+++ b/bin/deploy-ric-aux
@@ -16,30 +16,63 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-# This script deploys RIC auxiliary function components automatically
+# This script deploys RIC aux components automatically
 
-OVERRIDEYAML=$1
+if [ "$#" -eq 1 ]; then
+    OVERRIDEYAML=$1
+else
 
-if [ -z "$OVERRIDEYAML" ];then
-echo "****************************************************************************************************************"
-echo "                                                     WARNING                                                    "
-echo "****************************************************************************************************************"
-echo "Deploying RIC auxiliary functions without deployment recipe. Default configurations are used."
-echo "****************************************************************************************************************"
+    while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+        -f) OVERRIDEYAML=$2
+            shift
+            ;;
+        *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
+
+        esac
+
+        shift
+
+    done
+fi
 
 
+if [ -z "$OVERRIDEYAML" ];then
+    echo "****************************************************************************************************************"
+    echo "                                                     ERROR                                                      "
+    echo "****************************************************************************************************************"
+    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
+    echo "****************************************************************************************************************"
+    exit 1
 fi
 
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
 
-source $DIR/../etc/ric-aux.conf
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
 
-export RICAUX_RELEASE_NAME=$ric_aux_helm_release_name
+AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/aux-common
+cp /tmp/aux-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
 
-export RICAUX_NAMESPACE=$ric_aux_namespace
+helm repo index $HELM_HOME/repository/local/
 
 
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
 
-. ../ric-aux/80-Auxiliary-Functions/bin/install $OVERRIDEYAML
 
+$ROOT_DIR/../ric-aux/bin/install -f $OVERRIDEYAML