From d589fbbdf1592a0230dbbd4d4bb7b4e8ad3f2e7e Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Fri, 20 Oct 2023 16:32:57 +0100 Subject: Fix issues in scripts for s3ps Issue-ID: POLICY-4856 Change-Id: I0e69bfe59b1316e738ad78f1b2f9cdefc4e9afe4 Signed-off-by: saul.gill --- csit/resources/scripts/get-cluster-info.sh | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'csit/resources/scripts/get-cluster-info.sh') diff --git a/csit/resources/scripts/get-cluster-info.sh b/csit/resources/scripts/get-cluster-info.sh index efe0f517..272d2965 100755 --- a/csit/resources/scripts/get-cluster-info.sh +++ b/csit/resources/scripts/get-cluster-info.sh @@ -28,7 +28,9 @@ export XACML_PORT=30004 export DROOLS_PORT=30005 export DIST_PORT=30006 export ACM_PORT=30007 -export POLICY_PARTICIPANT_PORT=30008 +export POLICY_PF_PARTICIPANT_PORT=30008 +export POLICY_HTTP_PARTICIPANT_PORT=30009 +export POLICY_K8S_PARTICIPANT_PORT=30010 export DMAAP_PORT=30904 # Retrieve pod names @@ -42,19 +44,23 @@ function get_pod_names() { export DIST_POD=$(get_pod_name distribution) export ACM_POD=$(get_pod_name acm-runtime) export POLICY_PPNT_POD=$(get_pod_name policy-ppnt) + export POLICY_PPNT_POD=$(get_pod_name http-ppnt) + export POLICY_PPNT_POD=$(get_pod_name k8s-ppnt) } # Retrieve service names function get_svc_names() { - export APEX_SVC=$(get_svc_name policy-apex) + export APEX_SVC=$(get_svc_name policy-apex-pdp) export PAP_SVC=$(get_svc_name policy-pap) export API_SVC=$(get_svc_name policy-api) export DMAAP_SVC=$(get_svc_name message-router) export DROOLS_SVC=$(get_svc_name drools-pdp) - export XACML_SVC=$(get_svc_name xacml) - export DIST_SVC=$(get_svc_name distribution) - export ACM_SVC=$(get_svc_name acm-runtime) - export POLICY_PPNT_SVC=$(get_svc_name policy-ppnt) + export XACML_SVC=$(get_svc_name policy-xacml-pdp) + export DIST_SVC=$(get_svc_name policy-distribution) + export ACM_SVC=$(get_svc_name policy-clamp-runtime-acm) + export POLICY_PPNT_SVC=$(get_svc_name policy-clamp-ac-pf-ppnt) + export POLICY_HTTP_SVC=$(get_svc_name policy-clamp-ac-http-ppnt) + export POLICY_K8S_SVC=$(get_svc_name policy-clamp-ac-k8s-ppnt) } # Expose services in order to perform tests from JMeter @@ -66,7 +72,9 @@ function expose_services() { expose_service $DROOLS_SVC expose_service $DIST_SVC expose_service $ACM_SVC - export_service $POLICY_PPNT_SVC + expose_service $POLICY_PPNT_SVC + expose_service POLICY_HTTP_SVC + expose_service POLICY_K8S_SVC setup_message_router_svc sleep 2 @@ -95,7 +103,9 @@ function patch_ports() { patch_port "$API_SVC" $API_PORT patch_port "$PAP_SVC" $PAP_PORT patch_port "$ACM_SVC" $ACM_PORT - patch_port "$POLICY_PPNT_SVC" $POLICY_PARTICIPANT_PORT + patch_port "$POLICY_PPNT_SVC" $POLICY_PF_PARTICIPANT_PORT + patch_port "$HTTP_PPNT_SVC" $POLICY_HTTP_PARTICIPANT_PORT + patch_port "$K8S_PPNT_SVC" $POLICY_K8S_PARTICIPANT_PORT patch_port "$DIST_SVC" $DIST_PORT patch_port "$DROOLS_SVC" $DROOLS_PORT patch_port "$XACML_SVC" $XACML_PORT -- cgit 1.2.3-korg