X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fistio_api_functions.sh;h=dbbc6a50085e3345b2de9c6003e51b5169ec9419;hb=refs%2Fchanges%2F62%2F8262%2F1;hp=2afc3f9c89c240d16488d1cd66d1c71c26316d33;hpb=8fbc63697f2edaaf2c9db40f54b318e7211361e2;p=nonrtric.git

diff --git a/test/common/istio_api_functions.sh b/test/common/istio_api_functions.sh
index 2afc3f9c..dbbc6a50 100644
--- a/test/common/istio_api_functions.sh
+++ b/test/common/istio_api_functions.sh
@@ -69,6 +69,11 @@ __ISTIO_kube_scale_zero_and_wait() {
 # This function is called for apps managed by the test script.
 __ISTIO_kube_delete_all() {
 	__kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ISTIO
+	__kube_delete_all_resources $KUBE_A1SIM_NAMESPACE autotest ISTIO
+	__kube_delete_all_resources $KUBE_ONAP_NAMESPACE autotest ISTIO
+	__kube_delete_all_resources $KUBE_KEYCLOAK_NAMESPACE autotest ISTIO
+	__kube_delete_all_resources $KUBE_SDNC_NAMESPACE autotest ISTIO
+	__kube_delete_all_resources $KUBE_SIM_NAMESPACE autotest ISTIO
 }
 
 # Store docker logs
@@ -189,11 +194,11 @@ istio_req_auth_by_jwks() {
 }
 
 # Authorization policy - by realm
-# args: <app> <namespace> <realam>
+# args: <app> <namespace> <realam> [<client-id> <client-role>]
 istio_auth_policy_by_realm() {
 	__log_conf_start $@
-    if [ $# -ne 3 ]; then
-        __print_err "<app> <namespace> <realam>" $@
+    if [ $# -ne 3 ] && [ $# -ne 5 ]; then
+        __print_err "<app> <namespace> <realam> [<client-id> <client-role>]" $@
         return 1
     fi
 	name="ap-realm-"$3"-"$1"-"$2
@@ -208,6 +213,17 @@ istio_auth_policy_by_realm() {
 		__log_conf_fail_general "Cannot substitute yaml: $inputfile"
 		return 1
 	fi
+	if [ $# -gt 3 ]; then
+		export  ISTIO_TEMPLATE_REPLACE_AP_CLIENT=$4
+		export  ISTIO_TEMPLATE_REPLACE_AP_ROLE=$5
+		inputfile=$SIM_GROUP/$ISTIO_COMPOSE_DIR/ap-role-snippet.yaml
+		envsubst < $inputfile >> $outputfile
+		if [ $? -ne 0 ]; then
+			__log_conf_fail_general "Cannot substitute yaml: $inputfile"
+			return 1
+		fi
+	fi
+
 	kubectl $KUBECONF apply -f $outputfile &> tmp/kubeerr
 	if [ $? -ne 0 ]; then
 		__log_conf_fail_general "Cannot apply yaml: $outputfile"