X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tutorials%2FvFWDT%2Fpolicies%2Frules%2FuploadPolicies.sh;h=58c7927ef2a99f4b4c1c26634da138b6030a9214;hb=58c9ec4f703dade672e210f6bc127ee3869bb3bd;hp=7d1ccd12c40f5ee8b52b9a1096e6214580576ef2;hpb=7e8edf7f0f52169cbda36b45dfa67db2d3e34eab;p=demo.git

diff --git a/tutorials/vFWDT/policies/rules/uploadPolicies.sh b/tutorials/vFWDT/policies/rules/uploadPolicies.sh
index 7d1ccd12..58c7927e 100755
--- a/tutorials/vFWDT/policies/rules/uploadPolicies.sh
+++ b/tutorials/vFWDT/policies/rules/uploadPolicies.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ============LICENSE_START=======================================================
-# Copyright (C) 2019 Orange
+# Copyright (C) 2020 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,59 +17,13 @@
 #
 # ============LICENSE_END=========================================================
 
-`./yq > /dev/null 2>&1`
-
-if [ $? -ne 0 ]; then
-	echo "Install yq"
-	wget -cO yq https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64
-	chmod 755 yq
-fi
-
-`jo -p n=1 > /dev/null 2>&1`
-
-if [ $? -ne 0 ]; then
-        echo "Install jo"
-        sudo add-apt-repository -y ppa:duggan/jo
-        sudo apt update
-        sudo apt install jo -y
-fi
-
-echo "Uploading policies"
-
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-PDP=`kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}' | grep policy-pdp`
-
-echo $PDP
-CMD='createPolicy'
-MODE=$1
+API=`kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}' | grep policy-api`
 
-if [[ $MODE == "U" ]]; then
-	CMD='updatePolicy'
-fi
+`find $DIR/*.json | xargs -i{} kubectl cp {} onap/$API:/tmp/`
 
-echo $CMD
 SCRIPT="dt-policies.sh"
-echo "#!/bin/bash" > $SCRIPT
-
-for f in $DIR/*.json; do
-	NAME=`./yq r $f policyName`
-	SCOPE="$(cut -d'.' -f1 <<< $NAME )"
-	RULE=`cat $f`
-	BODY="\"$RULE\""
-	echo "Processing $NAME rule..";
-	echo "echo \"$NAME Policy\"" >> $SCRIPT
-	BODY=`jo -p configBody="$BODY" -p policyName=$NAME -p policyConfigType=MicroService -p onapName=SampleDemo -p policyScope=$SCOPE`
-	LINK="curl -k -v  -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '$BODY' 'https://localhost:8081/pdp/api/$CMD'"
-	LINK="${LINK/\"\\\"{\\n/\"{}"
-	LINK="${LINK/\\\"\"/\"}"
-	LINK="${LINK//\\n/ }"
-	echo "$LINK" >> $SCRIPT
-	BODY=`jo -p policyType=MicroService -p pdpGroup=default -p policyName=$NAME`
-	LINK="curl -k -v  -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '$BODY' 'https://localhost:8081/pdp/api/pushPolicy'"
-	echo "$LINK" >> $SCRIPT
-done
-
-`kubectl cp $SCRIPT onap/$PDP:/tmp/policy-install`
-`kubectl exec $PDP -- chmod 755 $SCRIPT`
-`kubectl exec $PDP -- ./$SCRIPT`
 
+kubectl cp $DIR/$SCRIPT onap/$API:/tmp/`
+kubectl exec $API -- chmod 755 /tmp/$SCRIPT`
+kubectl exec $API -- /tmp/$SCRIPT