# ============LICENSE_END=================================================
#
-# This is a script that contains specific test functions for Policy Agent API
-
-### API functiond towards the Policy Agent
-
-# Generic function to query the agent via the REST or DMAAP interface.
-# Used by all other agent api test functions
-# If operation prefix is '_BATCH' the the send and get response is split in two sequences,
-# one for sending the requests and one for receiving the response
-# but only when using the DMAAP interface
-# REST or DMAAP is controlled of the base url of $ADAPTER
-# arg: (GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url> [<file>]) | (RESPONSE <correlation-id>)
-# (Not for test scripts)
-__do_curl_to_agent() {
- echo "(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- paramError=0
+# This is a script that contains management and test functions for Policy Agent
- if [ $# -lt 2 ] || [ $# -gt 3 ]; then
- paramError=1
- else
- timeout=""
- oper=""
- file=''
- httpcode=" -sw %{http_code}"
- accept=''
- content=''
- batch=0
- if [[ $1 == *"_BATCH" ]]; then
- batch=1
- fi
- if [ $# -gt 2 ]; then
- content=" -H Content-Type:application/json"
- fi
- if [ $1 == "GET" ] || [ $1 == "GET_BATCH" ]; then
- oper="GET"
- if [ $# -ne 2 ]; then
- paramError=1
- fi
- elif [ $1 == "PUT" ] || [ $1 == "PUT_BATCH" ]; then
- oper="PUT"
- if [ $# -eq 3 ]; then
- file=" --data-binary @$3"
- fi
- accept=" -H accept:application/json"
- elif [ $1 == "POST" ] || [ $1 == "POST_BATCH" ]; then
- oper="POST"
- accept=" -H accept:*/*"
- if [ $# -ne 2 ]; then
- paramError=1
+################ Test engine functions ################
+
+# Create the image var used during the test
+# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
+# <image-tag-suffix> is present only for images with staging, snapshot,release tags
+__PA_imagesetup() {
+ __check_and_create_image_var PA "POLICY_AGENT_IMAGE" "POLICY_AGENT_IMAGE_BASE" "POLICY_AGENT_IMAGE_TAG" $1 "$POLICY_AGENT_DISPLAY_NAME"
+}
+
+# Pull image from remote repo or use locally built image
+# arg: <pull-policy-override> <pull-policy-original>
+# <pull-policy-override> Shall be used for images allowing overriding. For example use a local image when test is started to use released images
+# <pull-policy-original> Shall be used for images that does not allow overriding
+# Both var may contain: 'remote', 'remote-remove' or 'local'
+__PA_imagepull() {
+ __check_and_pull_image $1 "$POLICY_AGENT_DISPLAY_NAME" $POLICY_AGENT_APP_NAME POLICY_AGENT_IMAGE
+}
+
+# Build image (only for simulator or interfaces stubs owned by the test environment)
+# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
+# <image-tag-suffix> is present only for images with staging, snapshot,release tags
+__PA_imagebuild() {
+ echo -e $RED" Image for app PA shall never be built"$ERED
+}
+
+# Generate a string for each included image using the app display name and a docker images format string
+# If a custom image repo is used then also the source image from the local repo is listed
+# arg: <docker-images-format-string> <file-to-append>
+__PA_image_data() {
+ echo -e "$POLICY_AGENT_DISPLAY_NAME\t$(docker images --format $1 $POLICY_AGENT_IMAGE)" >> $2
+ if [ ! -z "$POLICY_AGENT_IMAGE_SOURCE" ]; then
+ echo -e "-- source image --\t$(docker images --format $1 $POLICY_AGENT_IMAGE_SOURCE)" >> $2
+ fi
+}
+
+# Scale kubernetes resources to zero
+# All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action.
+# This function is called for apps fully managed by the test script
+__PA_kube_scale_zero() {
+ __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest PA
+}
+
+# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
+# This function is called for prestarted apps not managed by the test script.
+__PA_kube_scale_zero_and_wait() {
+ __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-policymanagementservice
+}
+
+# Delete all kube resouces for the app
+# This function is called for apps managed by the test script.
+__PA_kube_delete_all() {
+ __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest PA
+}
+
+# Store docker logs
+# This function is called for apps managed by the test script.
+# args: <log-dir> <file-prexix>
+__PA_store_docker_logs() {
+ if [ $RUNMODE == "KUBE" ]; then
+ kubectl logs -l "autotest=PA" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_policy-agent.log 2>&1
+ else
+ docker logs $POLICY_AGENT_APP_NAME > $1$2_policy-agent.log 2>&1
+ fi
+}
+
+# Initial setup of protocol, host and ports
+# This function is called for apps managed by the test script.
+# args: -
+__PA_initial_setup() {
+ use_agent_rest_http
+}
+
+#######################################################
+
+###########################
+### Policy Agents functions
+###########################
+
+# Set http as the protocol to use for all communication to the Policy Agent
+# args: -
+# (Function for test scripts)
+use_agent_rest_http() {
+ __agent_set_protocoll "http" $POLICY_AGENT_INTERNAL_PORT $POLICY_AGENT_EXTERNAL_PORT
+}
+
+# Set https as the protocol to use for all communication to the Policy Agent
+# args: -
+# (Function for test scripts)
+use_agent_rest_https() {
+ __agent_set_protocoll "https" $POLICY_AGENT_INTERNAL_SECURE_PORT $POLICY_AGENT_EXTERNAL_SECURE_PORT
+}
+
+# All calls to the agent will be directed to the agent dmaap interface over http from now on
+# args: -
+# (Function for test scripts)
+use_agent_dmaap_http() {
+ echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME dmaap protocol setting"$EBOLD
+ echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards the agent"
+ PA_ADAPTER_TYPE="MR-HTTP"
+ echo ""
+}
+
+# All calls to the agent will be directed to the agent dmaap interface over https from now on
+# args: -
+# (Function for test scripts)
+use_agent_dmaap_https() {
+ echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME dmaap protocol setting"$EBOLD
+ echo -e " Using $BOLD https $EBOLD and $BOLD DMAAP $EBOLD towards the agent"
+ echo -e $YELLOW" Setting http instead of https - MR only uses http"$EYELLOW
+ PA_ADAPTER_TYPE="MR-HTTPS"
+ echo ""
+}
+
+# Setup paths to svc/container for internal and external access
+# args: <protocol> <internal-port> <external-port>
+__agent_set_protocoll() {
+ echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME protocol setting"$EBOLD
+ echo -e " Using $BOLD http $EBOLD towards $POLICY_AGENT_DISPLAY_NAME"
+
+ ## Access to Dmaap adapter
+
+ PA_SERVICE_PATH=$1"://"$POLICY_AGENT_APP_NAME":"$2 # docker access, container->container and script->container via proxy
+ if [ $RUNMODE == "KUBE" ]; then
+ PA_SERVICE_PATH=$1"://"$POLICY_AGENT_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
+ fi
+
+ # PA_ADAPTER used for switching between REST and DMAAP (only REST supported currently)
+ PA_ADAPTER_TYPE="REST"
+ PA_ADAPTER=$PA_SERVICE_PATH
+
+ echo ""
+}
+
+# Make curl retries towards the agent for http response codes set in this env var, space separated list of codes
+AGENT_RETRY_CODES=""
+
+#Save first worker node the pod is started on
+__PA_WORKER_NODE=""
+
+# Export env vars for config files, docker compose and kube resources
+# args: PROXY|NOPROXY
+__export_agent_vars() {
+
+ export POLICY_AGENT_APP_NAME
+ export POLICY_AGENT_APP_NAME_ALIAS
+ export POLICY_AGENT_DISPLAY_NAME
+
+ export KUBE_NONRTRIC_NAMESPACE
+ export POLICY_AGENT_IMAGE
+ export POLICY_AGENT_INTERNAL_PORT
+ export POLICY_AGENT_INTERNAL_SECURE_PORT
+ export POLICY_AGENT_EXTERNAL_PORT
+ export POLICY_AGENT_EXTERNAL_SECURE_PORT
+ export POLICY_AGENT_CONFIG_MOUNT_PATH
+ export POLICY_AGENT_DATA_MOUNT_PATH
+ export POLICY_AGENT_CONFIG_CONFIGMAP_NAME=$POLICY_AGENT_APP_NAME"-config"
+ export POLICY_AGENT_DATA_CONFIGMAP_NAME=$POLICY_AGENT_APP_NAME"-data"
+ export POLICY_AGENT_PKG_NAME
+ export CONSUL_HOST
+ export CONSUL_INTERNAL_PORT
+ export CONFIG_BINDING_SERVICE
+ export POLICY_AGENT_CONFIG_KEY
+ export DOCKER_SIM_NWNAME
+ export POLICY_AGENT_HOST_MNT_DIR
+ export POLICY_AGENT_CONFIG_FILE
+
+ export POLICY_AGENT_DATA_PV_NAME=$POLICY_AGENT_APP_NAME"-pv"
+ export POLICY_AGENT_DATA_PVC_NAME=$POLICY_AGENT_APP_NAME"-pvc"
+ ##Create a unique path for the pv each time to prevent a previous volume to be reused
+ export POLICY_AGENT_PV_PATH="padata-"$(date +%s)
+ export POLICY_AGENT_CONTAINER_MNT_DIR
+
+ if [ $1 == "PROXY" ]; then
+ export AGENT_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT #Set if proxy is started
+ export AGENT_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
+ if [ $AGENT_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$AGENT_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
+ echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
+ else
+ echo " Configured with http proxy"
fi
- elif [ $1 == "DELETE" ] || [ $1 == "DELETE_BATCH" ]; then
- oper="DELETE"
- if [ $# -ne 2 ]; then
- paramError=1
+ else
+ export AGENT_HTTP_PROXY_CONFIG_PORT=0
+ export AGENT_HTTP_PROXY_CONFIG_HOST_NAME=""
+ echo " Configured without http proxy"
+ fi
+}
+
+
+# Start the policy agent
+# args: (docker) PROXY|NOPROXY <config-file>
+# args: (kube) PROXY|NOPROXY <config-file> [ <data-file>]
+# (Function for test scripts)
+start_policy_agent() {
+ echo -e $BOLD"Starting $POLICY_AGENT_DISPLAY_NAME"$EBOLD
+
+ if [ $RUNMODE == "KUBE" ]; then
+
+ # Check if app shall be fully managed by the test script
+ __check_included_image "PA"
+ retcode_i=$?
+
+ # Check if app shall only be used by the testscipt
+ __check_prestarted_image "PA"
+ retcode_p=$?
+
+ if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
+ echo -e $RED"The $POLICY_AGENT_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+ echo -e $RED"The $POLICY_AGENT_APP_NAME will not be started"$ERED
+ exit
+ fi
+ if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
+ echo -e $RED"The $POLICY_AGENT_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+ echo -e $RED"The $POLICY_AGENT_APP_NAME will not be started"$ERED
+ exit
+ fi
+
+ if [ $retcode_p -eq 0 ]; then
+ echo -e " Using existing $POLICY_AGENT_APP_NAME deployment and service"
+ echo " Setting $POLICY_AGENT_APP_NAME replicas=1"
+ res_type=$(__kube_get_resource_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ fi
+
+ if [ $retcode_i -eq 0 ]; then
+
+ echo -e " Creating $POLICY_AGENT_APP_NAME app and expose service"
+
+ #Check if nonrtric namespace exists, if not create it
+ __kube_create_namespace $KUBE_NONRTRIC_NAMESPACE
+
+ __export_agent_vars $1
+
+ # Create config map for config
+ configfile=$PWD/tmp/$POLICY_AGENT_CONFIG_FILE
+ cp $2 $configfile
+ output_yaml=$PWD/tmp/pa_cfc.yaml
+ __kube_create_configmap $POLICY_AGENT_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest PA $configfile $output_yaml
+
+ # Create config map for data
+ data_json=$PWD/tmp/$POLICY_AGENT_DATA_FILE
+ if [ $# -lt 3 ]; then
+ #create empty dummy file
+ echo "{}" > $data_json
+ else
+ cp $3 $data_json
fi
- elif [ $1 == "RESPONSE" ]; then
- oper="RESPONSE"
- if [ $# -ne 2 ]; then
- paramError=1
+ output_yaml=$PWD/tmp/pa_cfd.yaml
+ __kube_create_configmap $POLICY_AGENT_DATA_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest PA $data_json $output_yaml
+
+ ## Create pv
+ input_yaml=$SIM_GROUP"/"$POLICY_AGENT_COMPOSE_DIR"/"pv.yaml
+ output_yaml=$PWD/tmp/pa_pv.yaml
+ __kube_create_instance pv $POLICY_AGENT_APP_NAME $input_yaml $output_yaml
+
+ ## Create pvc
+ input_yaml=$SIM_GROUP"/"$POLICY_AGENT_COMPOSE_DIR"/"pvc.yaml
+ output_yaml=$PWD/tmp/pa_pvc.yaml
+ __kube_create_instance pvc $POLICY_AGENT_APP_NAME $input_yaml $output_yaml
+
+ # Create service
+ input_yaml=$SIM_GROUP"/"$POLICY_AGENT_COMPOSE_DIR"/"svc.yaml
+ output_yaml=$PWD/tmp/pa_svc.yaml
+ __kube_create_instance service $POLICY_AGENT_APP_NAME $input_yaml $output_yaml
+
+ # Create app
+ input_yaml=$SIM_GROUP"/"$POLICY_AGENT_COMPOSE_DIR"/"app.yaml
+ output_yaml=$PWD/tmp/pa_app.yaml
+ __kube_create_instance app $POLICY_AGENT_APP_NAME $input_yaml $output_yaml
+
+ fi
+
+ # Keep the initial worker node in case the pod need to be "restarted" - must be made to the same node due to a volume mounted on the host
+ if [ $retcode_i -eq 0 ]; then
+ __PA_WORKER_NODE=$(kubectl get pod -l "autotest=PA" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}')
+ if [ -z "$__PA_WORKER_NODE" ]; then
+ echo -e $YELLOW" Cannot find worker node for pod for $POLICY_AGENT_APP_NAME, persistency may not work"$EYELLOW
fi
- if ! [ $ADAPTER == $DMAAPBASE ]; then
- paramError=1
+ else
+ echo -e $YELLOW" Persistency may not work for app $POLICY_AGENT_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ fi
+
+ __check_service_start $POLICY_AGENT_APP_NAME $PA_SERVICE_PATH$POLICY_AGENT_ALIVE_URL
+
+ else
+ __check_included_image 'PA'
+ if [ $? -eq 1 ]; then
+ echo -e $RED"The Policy Agent app is not included in this test script"$ERED
+ echo -e $RED"The Policy Agent will not be started"$ERED
+ exit
+ fi
+
+ curdir=$PWD
+ cd $SIM_GROUP
+ cd policy_agent
+ cd $POLICY_AGENT_HOST_MNT_DIR
+ #cd ..
+ if [ -d db ]; then
+ if [ "$(ls -A $DIR)" ]; then
+ echo -e $BOLD" Cleaning files in mounted dir: $PWD/db"$EBOLD
+ rm -rf db/* &> /dev/null
+ if [ $? -ne 0 ]; then
+ echo -e $RED" Cannot remove database files in: $PWD"$ERED
+ exit 1
+ fi
fi
else
- paramError=1
+ echo " No files in mounted dir or dir does not exists"
fi
+ cd $curdir
+
+ __export_agent_vars $1
+
+ dest_file=$SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_HOST_MNT_DIR/application.yaml
+
+ envsubst < $2 > $dest_file
+
+ __start_container $POLICY_AGENT_COMPOSE_DIR "" NODOCKERARGS 1 $POLICY_AGENT_APP_NAME
+
+ __check_service_start $POLICY_AGENT_APP_NAME $PA_SERVICE_PATH$POLICY_AGENT_ALIVE_URL
fi
+ echo ""
+ return 0
+}
- if [ $paramError -eq 1 ]; then
- ((RES_CONF_FAIL++))
- echo "-Incorrect number of parameters to __do_curl_agent " $@ >> $HTTPLOG
- echo "-Expected: (GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url> [<file>]) | (RESPONSE <correlation-id>) [<file>]" >> $HTTPLOG
- echo "-Returning response 000" >> $HTTPLOG
- echo "-000"
- return 1
- fi
+# Stop the policy agent
+# args: -
+# args: -
+# (Function for test scripts)
+stop_policy_agent() {
+ echo -e $BOLD"Stopping $POLICY_AGENT_DISPLAY_NAME"$EBOLD
- if [ $ADAPTER == $RESTBASE ] || [ $ADAPTER == $RESTBASE_SECURE ]; then
- url=" "${ADAPTER}${2}
- oper=" -X "$oper
- curlString="curl -k "${oper}${timeout}${httpcode}${accept}${content}${url}${file}
- echo " CMD: "$curlString >> $HTTPLOG
- if [ $# -eq 3 ]; then
- echo " FILE: $(<$3)" >> $HTTPLOG
+ if [ $RUNMODE == "KUBE" ]; then
+
+ __check_prestarted_image "PA"
+ if [ $? -eq 0 ]; then
+ echo -e $YELLOW" Persistency may not work for app $POLICY_AGENT_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ res_type=$(__kube_get_resource_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
+ return 0
+ fi
+ __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest PA
+ echo " Deleting the replica set - a new will be started when the app is started"
+ tmp=$(kubectl delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=PA")
+ if [ $? -ne 0 ]; then
+ echo -e $RED" Could not delete replica set "$RED
+ ((RES_CONF_FAIL++))
+ return 1
+ fi
+ else
+ docker stop $POLICY_AGENT_APP_NAME &> ./tmp/.dockererr
+ if [ $? -ne 0 ]; then
+ __print_err "Could not stop $POLICY_AGENT_APP_NAME" $@
+ cat ./tmp/.dockererr
+ ((RES_CONF_FAIL++))
+ return 1
fi
+ fi
+ echo -e $BOLD$GREEN"Stopped"$EGREEN$EBOLD
+ echo ""
+ return 0
+}
- # Do retry for configured response codes, otherwise only one attempt
- maxretries=5
- while [ $maxretries -ge 0 ]; do
+# Start a previously stopped policy agent
+# args: -
+# (Function for test scripts)
+start_stopped_policy_agent() {
+ echo -e $BOLD"Starting (the previously stopped) $POLICY_AGENT_DISPLAY_NAME"$EBOLD
- let maxretries=maxretries-1
- res=$($curlString)
- retcode=$?
- if [ $retcode -ne 0 ]; then
- echo " RETCODE: "$retcode >> $HTTPLOG
- echo "000"
- return 1
- fi
- retry=0
- echo " RESP: "$res >> $HTTPLOG
- status=${res:${#res}-3}
- if [ ! -z "${AGENT_RETRY_CODES}" ]; then
- for retrycode in $AGENT_RETRY_CODES; do
- if [ $retrycode -eq $status ]; then
- echo -e $RED" Retrying (according to set codes for retry), got status $status....."$ERED >> $HTTPLOG
- sleep 1
- retry=1
- fi
- done
- fi
- if [ $retry -eq 0 ]; then
- maxretries=-1
- fi
- done
- echo $res
- return 0
- else
- if [ $oper != "RESPONSE" ]; then
- requestUrl=$2
- if [ $1 == "PUT" ] && [ $# -eq 3 ]; then
- payload="$(cat $3 | tr -d '\n' | tr -d ' ' )"
- echo "payload: "$payload >> $HTTPLOG
- file=" --data-binary "$payload
- fi
- #urlencode the request url since it will be carried by send-request url
- requestUrl=$(python3 -c "from __future__ import print_function; import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1]))" "$2")
- url=" "${ADAPTER}"/send-request?url="${requestUrl}"&operation="${oper}
- curlString="curl -X POST${timeout}${httpcode}${content}${url}${file}"
- echo " CMD: "$curlString >> $HTTPLOG
- res=$($curlString)
- retcode=$?
- if [ $retcode -ne 0 ]; then
- echo " RETCODE: "$retcode >> $HTTPLOG
- echo "000"
- return 1
- fi
- echo " RESP: "$res >> $HTTPLOG
- status=${res:${#res}-3}
- if [ $status -ne 200 ]; then
- echo "000"
- return 1
- fi
- cid=${res:0:${#res}-3}
- if [[ $batch -eq 1 ]]; then
- echo $cid"200"
- return 0
- fi
+ if [ $RUNMODE == "KUBE" ]; then
+
+ __check_prestarted_image "PA"
+ if [ $? -eq 0 ]; then
+ echo -e $YELLOW" Persistency may not work for app $POLICY_AGENT_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ res_type=$(__kube_get_resource_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ __check_service_start $POLICY_AGENT_APP_NAME $PA_SERVICE_PATH$POLICY_AGENT_ALIVE_URL
+ return 0
fi
- if [ $oper == "RESPONSE" ] || [ $batch -eq 0 ]; then
- if [ $oper == "RESPONSE" ]; then
- cid=$2
- fi
- url=" "${ADAPTER}"/receive-response?correlationid="${cid}
- curlString="curl -X GET"${timeout}${httpcode}${url}
- echo " CMD: "$curlString >> $HTTPLOG
- res=$($curlString)
- retcode=$?
- if [ $retcode -ne 0 ]; then
- echo " RETCODE: "$retcode >> $HTTPLOG
- echo "000"
- return 1
- fi
- echo " RESP: "$res >> $HTTPLOG
- status=${res:${#res}-3}
- TS=$SECONDS
- # wait of the reply from the agent...
- while [ $status -eq 204 ]; do
- if [ $(($SECONDS - $TS)) -gt 90 ]; then
- echo " RETCODE: (timeout after 90s)" >> $HTTPLOG
- echo "000"
- return 1
- fi
- sleep 0.01
- echo " CMD: "$curlString >> $HTTPLOG
- res=$($curlString)
- if [ $retcode -ne 0 ]; then
- echo " RETCODE: "$retcode >> $HTTPLOG
- echo "000"
- return 1
- fi
- echo " RESP: "$res >> $HTTPLOG
- status=${res:${#res}-3}
- done
- if [ $status -eq 200 ]; then
- body=${res:0:${#res}-3}
- echo $body
- return 0
+
+ # Tie the PMS to the same worker node it was initially started on
+ # A PVC of type hostPath is mounted to PMS, for persistent storage, so the PMS must always be on the node which mounted the volume
+ if [ -z "$__PA_WORKER_NODE" ]; then
+ echo -e $RED" No initial worker node found for pod "$RED
+ ((RES_CONF_FAIL++))
+ return 1
+ else
+ echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__PA_WORKER_NODE to deployment for $POLICY_AGENT_APP_NAME. Pod will always run on this worker node: $__PA_WORKER_NODE"$BOLD
+ echo -e $BOLD" The mounted volume is mounted as hostPath and only available on that worker node."$BOLD
+ tmp=$(kubectl patch deployment $POLICY_AGENT_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__PA_WORKER_NODE'"}}}}}')
+ if [ $? -ne 0 ]; then
+ echo -e $YELLOW" Cannot set nodeSelector to deployment for $POLICY_AGENT_APP_NAME, persistency may not work"$EYELLOW
fi
- echo "Status not 200, returning response 000" >> $HTTPLOG
- echo "0000"
+ __kube_scale deployment $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ fi
+ else
+ docker start $POLICY_AGENT_APP_NAME &> ./tmp/.dockererr
+ if [ $? -ne 0 ]; then
+ __print_err "Could not start (the stopped) $POLICY_AGENT_APP_NAME" $@
+ cat ./tmp/.dockererr
+ ((RES_CONF_FAIL++))
return 1
fi
- fi
+ fi
+ __check_service_start $POLICY_AGENT_APP_NAME $PA_SERVICE_PATH$POLICY_AGENT_ALIVE_URL
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+ echo ""
+ return 0
+}
+
+
+
+# Load the the appl config for the agent into a config map
+agent_load_config() {
+ echo -e $BOLD"Agent - load config from "$EBOLD$1
+ data_json=$PWD/tmp/$POLICY_AGENT_DATA_FILE
+ cp $1 $data_json
+ output_yaml=$PWD/tmp/pa_cfd.yaml
+ __kube_create_configmap $POLICY_AGENT_APP_NAME"-data" $KUBE_NONRTRIC_NAMESPACE autotest PA $data_json $output_yaml
+ echo ""
}
+# Turn on debug level tracing in the agent
+# args: -
+# (Function for test scripts)
+set_agent_debug() {
+ echo -e $BOLD"Setting agent debug logging"$EBOLD
+ curlString="$PA_SERVICE_PATH$POLICY_AGENT_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}"
+ result=$(__do_curl "$curlString")
+ if [ $? -ne 0 ]; then
+ __print_err "could not set debug mode" $@
+ ((RES_CONF_FAIL++))
+ return 1
+ fi
+ echo ""
+ return 0
+}
+
+# Turn on trace level tracing in the agent
+# args: -
+# (Function for test scripts)
+set_agent_trace() {
+ echo -e $BOLD"Setting agent trace logging"$EBOLD
+ curlString="$PA_SERVICE_PATH$POLICY_AGENT_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}"
+ result=$(__do_curl "$curlString")
+ if [ $? -ne 0 ]; then
+ __print_err "could not set trace mode" $@
+ ((RES_CONF_FAIL++))
+ return 1
+ fi
+ echo ""
+ return 0
+}
+
+# Perform curl retries when making direct call to the agent for the specified http response codes
+# Speace separated list of http response codes
+# args: [<response-code>]*
+use_agent_retries() {
+ echo -e $BOLD"Do curl retries to the agent REST inteface for these response codes:$@"$EBOLD
+ AGENT_RETRY_CODES=$@
+ echo ""
+ return
+}
+
+# Check the agent logs for WARNINGs and ERRORs
+# args: -
+# (Function for test scripts)
+check_policy_agent_logs() {
+ __check_container_logs "Policy Agent" $POLICY_AGENT_APP_NAME $POLICY_AGENT_LOGPATH WARN ERR
+}
+
#########################################################
#### Test case functions A1 Policy management service
#########################################################
echo "(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
if [ $# -eq 2 ] || [ $# -eq 3 ]; then
if [[ $1 == "json:"* ]]; then
- __var_test "Policy Agent" $LOCALHOST$POLICY_AGENT_EXTERNAL_PORT"/" $1 "=" $2 $3
+ if [ "$PMS_VERSION" == "V2" ]; then
+ __var_test "Policy Agent" $PA_SERVICE_PATH$PMS_API_PREFIX"/v2/" $1 "=" $2 $3
+ else
+ __var_test "Policy Agent" $PA_SERVICE_PATH"/" $1 "=" $2 $3
+ fi
return 0
fi
fi
-
- ((RES_CONF_FAIL++))
__print_err "needs two or three args: json:<json-array-param> <target-value> [ timeout ]" $@
return 1
}
-# API Test function: GET /policies
-# args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-ype-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]
+# API Test function: GET /policies and V2 GET /v2/policy-instances
+# args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]
+# args(V2): <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]
# (Function for test scripts)
api_get_policies() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
- paramError=0
- if [ $# -lt 4 ]; then
- paramError=1
- elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
- paramError=1
- elif [ $# -gt 4 ] && [ $(($#%5)) -ne 4 ]; then
- paramError=1
+ __log_test_start $@
+
+ if [ "$PMS_VERSION" == "V2" ]; then
+ paramError=0
+ variableParams=$(($#-4))
+ if [ $# -lt 4 ]; then
+ paramError=1
+ elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
+ paramError=1
+ elif [ $# -gt 5 ] && [ $(($variableParams%7)) -ne 0 ]; then
+ paramError=1
+ fi
+
+ if [ $paramError -ne 0 ]; then
+ __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]" $@
+ return 1
+ fi
+ else
+ paramError=0
+ variableParams=$(($#-4))
+ if [ $# -lt 4 ]; then
+ paramError=1
+ elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
+ paramError=1
+ elif [ $# -gt 5 ] && [ $(($variableParams%5)) -ne 0 ]; then
+ paramError=1
+ fi
+
+ if [ $paramError -ne 0 ]; then
+ __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
+ return 1
+ fi
fi
- if [ $paramError -ne 0 ]; then
- __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-ype-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
- return 1
- fi
queryparams=""
- if [ $2 != "NORIC" ]; then
- queryparams="?ric="$2
- fi
- if [ $3 != "NOSERVICE" ]; then
- if [ -z $queryparams ]; then
- queryparams="?service="$3
- else
- queryparams=$queryparams"&service="$3
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $2 != "NORIC" ]; then
+ queryparams="?ric_id="$2
fi
- fi
- if [ $4 != "NOTYPE" ]; then
- if [ -z $queryparams ]; then
- queryparams="?type="$4
- else
- queryparams=$queryparams"&type="$4
+ if [ $3 != "NOSERVICE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?service_id="$3
+ else
+ queryparams=$queryparams"&service_id="$3
+ fi
+ fi
+ if [ $4 != "NOTYPE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?policytype_id="$4
+ else
+ queryparams=$queryparams"&policytype_id="$4
+ fi
fi
- fi
- query="/policies"$queryparams
- res="$(__do_curl_to_agent GET $query)"
- status=${res:${#res}-3}
+ query="/v2/policy-instances"$queryparams
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
- if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
- return 1
- fi
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
+ return 1
+ fi
- if [ $# -gt 4 ]; then
- if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
- targetJson="["
- else
+ if [ $# -gt 4 ]; then
body=${res:0:${#res}-3}
- targetJson="["
- arr=(${@:5})
+ if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
+ targetJson="["
+ else
+ targetJson="["
+ arr=(${@:5})
- for ((i=0; i<$(($#-4)); i=i+5)); do
+ for ((i=0; i<$(($#-4)); i=i+7)); do
- if [ "$targetJson" != "[" ]; then
- targetJson=$targetJson","
- fi
- targetJson=$targetJson"{\"id\":\"${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i+1]}\",\"service\":\"${arr[$i+2]}\",\"type\":"
- if [ "${arr[$i+3]}" == "EMPTY" ]; then
- targetJson=$targetJson"\"\","
- else
- targetJson=$targetJson"\"${arr[$i+3]}\","
- fi
- file=".p.json"
- sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+4]} > $file
- json=$(cat $file)
- targetJson=$targetJson"\"json\":"$json"}"
- done
+ if [ "$targetJson" != "[" ]; then
+ targetJson=$targetJson","
+ fi
+ targetJson=$targetJson"{\"policy_id\":\"$UUID${arr[$i]}\",\"ric_id\":\"${arr[$i+1]}\",\"service_id\":\"${arr[$i+2]}\",\"policytype_id\":"
+ if [ "${arr[$i+3]}" == "EMPTY" ]; then
+ targetJson=$targetJson"\"\","
+ else
+ targetJson=$targetJson"\"${arr[$i+3]}\","
+ fi
+ targetJson=$targetJson"\"transient\":${arr[$i+4]},\"status_notification_uri\":\"${arr[$i+5]}\","
+ file="./tmp/.p.json"
+ sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+6]} > $file
+ json=$(cat $file)
+ targetJson=$targetJson"\"policy_data\":"$json"}"
+ done
+ fi
+
+ targetJson=$targetJson"]"
+ targetJson="{\"policies\": $targetJson}"
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+ else
+ if [ $2 != "NORIC" ]; then
+ queryparams="?ric="$2
+ fi
+ if [ $3 != "NOSERVICE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?service="$3
+ else
+ queryparams=$queryparams"&service="$3
+ fi
+ fi
+ if [ $4 != "NOTYPE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?type="$4
+ else
+ queryparams=$queryparams"&type="$4
+ fi
fi
- targetJson=$targetJson"]"
- echo "TARGET JSON: $targetJson" >> $HTTPLOG
- res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+ query="/policies"$queryparams
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
- if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
return 1
fi
+
+ if [ $# -gt 4 ]; then
+ if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
+ targetJson="["
+ else
+ body=${res:0:${#res}-3}
+ targetJson="["
+ arr=(${@:5})
+
+ for ((i=0; i<$(($#-4)); i=i+5)); do
+
+ if [ "$targetJson" != "[" ]; then
+ targetJson=$targetJson","
+ fi
+ targetJson=$targetJson"{\"id\":\"$UUID${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i+1]}\",\"service\":\"${arr[$i+2]}\",\"type\":"
+ if [ "${arr[$i+3]}" == "EMPTY" ]; then
+ targetJson=$targetJson"\"\","
+ else
+ targetJson=$targetJson"\"${arr[$i+3]}\","
+ fi
+ file="./tmp/.p.json"
+ sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+4]} > $file
+ json=$(cat $file)
+ targetJson=$targetJson"\"json\":"$json"}"
+ done
+ fi
+
+ targetJson=$targetJson"]"
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: GET /policy
-#args: <response-code> <policy-id> [<template-file>]
+
+# API Test function: GET /policy and V2 GET /v2/policies/{policy_id}
+# args: <response-code> <policy-id> [<template-file>]
+# args(V2): <response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]
+
# (Function for test scripts)
api_get_policy() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
- if [ $# -lt 2 ] || [ $# -gt 3 ]; then
- __print_err "<response-code> <policy-id> [<template-file>] " $@
- return 1
- fi
- query="/policy?id=$2"
- res="$(__do_curl_to_agent GET $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -ne 2 ] && [ $# -ne 8 ]; then
+ __print_err "<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]" $@
+ return 1
+ fi
+ query="/v2/policies/$UUID$2"
+ else
+ if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+ __print_err "<response-code> <policy-id> [<template-file>] " $@
+ return 1
+ fi
+ query="/policy?id=$UUID$2"
+ fi
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
- if [ $# -eq 3 ]; then
- #Create a policy json to compare with
- body=${res:0:${#res}-3}
- file=".p.json"
- sed 's/XXX/'${2}'/g' $3 > $file
- targetJson=$(< $file)
- echo "TARGET JSON: $targetJson" >> $HTTPLOG
- res=$(python3 ../common/compare_json.py "$targetJson" "$body")
- if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
- return 1
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -eq 8 ]; then
+
+ #Create a policy json to compare with
+ body=${res:0:${#res}-3}
+
+ targetJson="\"ric_id\":\"$5\",\"policy_id\":\"$UUID$2\",\"service_id\":\"$4\""
+ if [ $7 != "NOTRANSIENT" ]; then
+ targetJson=$targetJson", \"transient\":$7"
+ fi
+ if [ $6 != "NOTYPE" ]; then
+ targetJson=$targetJson", \"policytype_id\":\"$6\""
+ else
+ targetJson=$targetJson", \"policytype_id\":\"\""
+ fi
+ if [ $8 != "NOURL" ]; then
+ targetJson=$targetJson", \"status_notification_uri\":\"$8\""
+ fi
+
+ data=$(sed 's/XXX/'${2}'/g' $3)
+ targetJson=$targetJson", \"policy_data\":$data"
+ targetJson="{$targetJson}"
+
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+ else
+ if [ $# -eq 3 ]; then
+ #Create a policy json to compare with
+ body=${res:0:${#res}-3}
+ file="./tmp/.p.json"
+ sed 's/XXX/'${2}'/g' $3 > $file
+ targetJson=$(< $file)
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ fi
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: PUT /policy
-# args: <response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]
+# API Test function: PUT /policy and V2 PUT /policies
+# args: <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]
+# args(V2): <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]
# (Function for test scripts)
api_put_policy() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
- if [ $# -lt 7 ] || [ $# -gt 8 ]; then
- __print_err "<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]" $@
- return 1
- fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -lt 8 ] || [ $# -gt 9 ]; then
+ __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]" $@
+ return 1
+ fi
+ else
+ if [ $# -lt 7 ] || [ $# -gt 8 ]; then
+ __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]" $@
+ return 1
+ fi
+ fi
- ric=$3
count=0
max=1
+ serv=$2
+ ric=$3
+ pt=$4
+ pid=$5
+ trans=$6
- if [ $# -eq 8 ]; then
- max=$8
+ if [ "$PMS_VERSION" == "V2" ]; then
+ noti=$7
+ temp=$8
+ if [ $# -eq 9 ]; then
+ max=$9
+ fi
+ else
+ temp=$7
+ if [ $# -eq 8 ]; then
+ max=$8
+ fi
fi
- pid=$5
- file=$7
-
while [ $count -lt $max ]; do
- query="/policy?id=$pid&ric=$ric&service=$2"
+ if [ "$PMS_VERSION" == "V2" ]; then
- if [ $4 != "NOTYPE" ]; then
- query=$query"&type=$4"
- fi
+ query="/v2/policies"
- if [ $6 != NOTRANSIENT ]; then
- query=$query"&transient=$6"
- fi
+ inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
+ if [ $trans != "NOTRANSIENT" ]; then
+ inputJson=$inputJson", \"transient\":$trans"
+ fi
+ if [ $pt != "NOTYPE" ]; then
+ inputJson=$inputJson", \"policytype_id\":\"$pt\""
+ else
+ inputJson=$inputJson", \"policytype_id\":\"\""
+ fi
+ if [ $noti != "NOURL" ]; then
+ inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
+ fi
+ file="./tmp/.p.json"
+ data=$(sed 's/XXX/'${pid}'/g' $temp)
+ inputJson=$inputJson", \"policy_data\":$data"
+ inputJson="{$inputJson}"
+ echo $inputJson > $file
+ else
+ query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
+
+ if [ $pt != "NOTYPE" ]; then
+ query=$query"&type=$pt"
+ fi
- file=".p.json"
- sed 's/XXX/'${pid}'/g' $7 > $file
- res="$(__do_curl_to_agent PUT $query $file)"
+ if [ $trans != NOTRANSIENT ]; then
+ query=$query"&transient=$trans"
+ fi
+
+ file="./tmp/.p.json"
+ sed 's/XXX/'${pid}'/g' $temp > $file
+ fi
+ res="$(__do_curl_to_api PA PUT $query $file)"
status=${res:${#res}-3}
- echo -ne " Creating "$count"("$max")${SAMELINE}"
+ echo -ne " Executing "$count"("$max")${SAMELINE}"
if [ $status -ne $1 ]; then
- let pid=$pid+1
- echo " Created "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ echo " Executed "$count"?("$max")"
+ __log_test_fail_status_code $1 $status
return 1
fi
let pid=$pid+1
let count=$count+1
- echo -ne " Created "$count"("$max")${SAMELINE}"
+ echo -ne " Executed "$count"("$max")${SAMELINE}"
done
echo ""
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: PUT /policy to run in batch
-# args: <response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]
+# API Test function: PUT /policy and V2 PUT /policies, to run in batch
+# args: <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <template-file> [<count>]
+# args(V2): <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <notification-url>|NOURL <template-file> [<count>]
# (Function for test scripts)
+
api_put_policy_batch() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
- if [ $# -lt 7 ] || [ $# -gt 8 ]; then
- __print_err "<response-code> <service-name> <ric-id> <policytype-id> <policy-id> <transient> <template-file> [<count>]" $@
- return 1
- fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -lt 8 ] || [ $# -gt 9 ]; then
+ __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <notification-url>|NOURL <template-file> [<count>]" $@
+ return 1
+ fi
+ else
+ if [ $# -lt 7 ] || [ $# -gt 8 ]; then
+ __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <template-file> [<count>]" $@
+ return 1
+ fi
+ fi
- ric=$3
count=0
max=1
-
- if [ $# -eq 8 ]; then
- max=$8
+ serv=$2
+ ric=$3
+ pt=$4
+ pid=$5
+ trans=$6
+ if [ "$PMS_VERSION" == "V2" ]; then
+ noti=$7
+ temp=$8
+ if [ $# -eq 9 ]; then
+ max=$9
+ fi
+ else
+ temp=$7
+ if [ $# -eq 8 ]; then
+ max=$8
+ fi
fi
- pid=$5
- file=$7
ARR=""
while [ $count -lt $max ]; do
- query="/policy?id=$pid&ric=$ric&service=$2"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/policies"
+
+ inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
+ if [ $trans != "NOTRANSIENT" ]; then
+ inputJson=$inputJson", \"transient\":$trans"
+ fi
+ if [ $pt != "NOTYPE" ]; then
+ inputJson=$inputJson", \"policytype_id\":\"$pt\""
+ else
+ inputJson=$inputJson", \"policytype_id\":\"\""
+ fi
+ if [ $noti != "NOURL" ]; then
+ inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
+ fi
+ file="./tmp/.p.json"
+ data=$(sed 's/XXX/'${pid}'/g' $temp)
+ inputJson=$inputJson", \"policy_data\":$data"
+ inputJson="{$inputJson}"
+ echo $inputJson > $file
+ else
+ query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
- if [ $4 != "NOTYPE" ]; then
- query=$query"&type=$4"
- fi
+ if [ $pt != "NOTYPE" ]; then
+ query=$query"&type=$pt"
+ fi
- if [ $6 != NOTRANSIENT ]; then
- query=$query"&transient=$6"
+ if [ $trans != NOTRANSIENT ]; then
+ query=$query"&transient=$trans"
+ fi
+ file="./tmp/.p.json"
+ sed 's/XXX/'${pid}'/g' $temp > $file
fi
-
- file=".p.json"
- sed 's/XXX/'${pid}'/g' $7 > $file
- res="$(__do_curl_to_agent PUT_BATCH $query $file)"
+ res="$(__do_curl_to_api PA PUT_BATCH $query $file)"
status=${res:${#res}-3}
- echo -ne " Requested(batch) "$count"("$max")${SAMELINE}"
+ echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"
if [ $status -ne 200 ]; then
- let pid=$pid+1
echo " Requested(batch) "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status 200 (in request), got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code 200 $status
return 1
fi
cid=${res:0:${#res}-3}
count=0
for cid in $ARR; do
- res="$(__do_curl_to_agent RESPONSE $cid)"
+ res="$(__do_curl_to_api PA RESPONSE $cid)"
status=${res:${#res}-3}
- echo -ne " Created(batch) "$count"("$max")${SAMELINE}"
+ echo -ne " Accepting(batch) "$count"("$max")${SAMELINE}"
if [ $status -ne $1 ]; then
- let pid=$pid+1
- echo " Created(batch) "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ echo " Accepted(batch) "$count"?("$max")"
+ __log_test_fail_status_code $1 $status
return 1
fi
let count=$count+1
- echo -ne " Created(batch) "$count"("$max")${SAMELINE}"
+ echo -ne " Accepted(batch) "$count"("$max")${SAMELINE}"
done
echo ""
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: PUT /policy to run in i parallel for a number of rics
+# API Test function: PUT /policy and V2 PUT /policies, to run in i parallel for a number of rics
# args: <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>
+# args(V2): <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>
# (Function for test scripts)
api_put_policy_parallel() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
- if [ $# -ne 10 ]; then
- __print_err " <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>" $@
- return 1
- fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -ne 11 ]; then
+ __print_err "<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>" $@
+ return 1
+ fi
+ else
+ if [ $# -ne 10 ]; then
+ __print_err " <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>" $@
+ return 1
+ fi
+ fi
resp_code=$1; shift;
serv=$1; shift
ric_base=$1; shift;
type=$1; shift;
start_id=$1; shift;
transient=$1; shift;
+ if [ "$PMS_VERSION" == "V2" ]; then
+ noti=$1; shift;
+ else
+ noti=""
+ fi
template=$1; shift;
count=$1; shift;
pids=$1; shift;
- if [ $ADAPTER != $RESTBASE ] && [ $ADAPTER != $RESTBASE_SECURE ]; then
+ #if [ $PA_ADAPTER != $RESTBASE ] && [ $PA_ADAPTER != $RESTBASE_SECURE ]; then
+ if [ $PA_ADAPTER_TYPE != "REST" ]; then
echo " Info - api_put_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported"
echo " Info - will execute over agent REST"
fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $serv == "NOSERVICE" ]; then
+ serv=""
+ fi
+ query="$PMS_API_PREFIX/v2/policies"
+ else
+ if [ $serv == "NOSERVICE" ]; then
+ serv=""
+ fi
+ query="/policy?service=$serv"
- if [ $serv == "NOSERVICE" ]; then
- serv=""
- fi
- query="/policy?service=$serv"
+ if [ $type != "NOTYPE" ]; then
+ query=$query"&type=$type"
+ fi
- if [ $type != "NOTYPE" ]; then
- query=$query"&type=$type"
+ if [ $transient != NOTRANSIENT ]; then
+ query=$query"&transient=$transient"
+ fi
fi
- if [ $transient != NOTRANSIENT ]; then
- query=$query"&transient=$transient"
- fi
+ urlbase=${PA_ADAPTER}${query}
- urlbase=${ADAPTER}${query}
+ httpproxy="NOPROXY"
+ if [ ! -z "$KUBE_PROXY_PATH" ]; then
+ httpproxy=$KUBE_PROXY_PATH
+ fi
for ((i=1; i<=$pids; i++))
do
- echo "" > ".pid${i}.res.txt"
- echo $resp_code $urlbase $ric_base $num_rics $start_id $template $count $pids $i > ".pid${i}.txt"
+ uuid=$UUID
+ if [ -z "$uuid" ]; then
+ uuid="NOUUID"
+ fi
+ echo "" > "./tmp/.pid${i}.res.txt"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
+ else
+ echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
+ fi
echo $i
done | xargs -n 1 -I{} -P $pids bash -c '{
arg=$(echo {})
echo " Parallel process $arg started"
- tmp=$(< ".pid${arg}.txt")
- python3 ../common/create_policies_process.py $tmp > .pid${arg}.res.txt
+ tmp=$(< "./tmp/.pid${arg}.txt")
+ python3 ../common/create_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt
}'
msg=""
for ((i=1; i<=$pids; i++))
do
- file=".pid${i}.res.txt"
+ file="./tmp/.pid${i}.res.txt"
tmp=$(< $file)
if [ -z "$tmp" ]; then
echo " Process $i : unknown result (result file empty"
else
res=${tmp:0:1}
if [ $res == "0" ]; then
- echo " Process $i : OK"
+ echo " Process $i : OK - "${tmp:1}
else
echo " Process $i : failed - "${tmp:1}
msg="failed"
fi
done
if [ -z $msg ]; then
- echo " $(($count*$num_rics)) policies created/updated"
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass " $(($count*$num_rics)) policy request(s) executed"
return 0
fi
- echo -e $RED" FAIL. One of more processes failed to execute" $ERED
- ((RES_FAIL++))
+ __log_test_fail_general "One of more processes failed to execute"
return 1
}
-# API Test function: DELETE /policy
+# API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}
# args: <response-code> <policy-id> [count]
# (Function for test scripts)
api_delete_policy() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
__print_err "<response-code> <policy-id> [count]" $@
pid=$2
while [ $count -lt $max ]; do
- query="/policy?id="$pid
- res="$(__do_curl_to_agent DELETE $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/policies/"$UUID$pid
+ else
+ query="/policy?id="$UUID$pid
+ fi
+ res="$(__do_curl_to_api PA DELETE $query)"
status=${res:${#res}-3}
- echo -ne " Deleting "$count"("$max")${SAMELINE}"
+ echo -ne " Executing "$count"("$max")${SAMELINE}"
if [ $status -ne $1 ]; then
- echo " Deleted "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ echo " Executed "$count"?("$max")"
+ __log_test_fail_status_code $1 $status
return 1
fi
let pid=$pid+1
let count=$count+1
- echo -ne " Deleted "$count"("$max")${SAMELINE}"
+ echo -ne " Executed "$count"("$max")${SAMELINE}"
done
echo ""
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: DELETE /policy to run in batch
+# API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in batch
# args: <response-code> <policy-id> [count]
# (Function for test scripts)
api_delete_policy_batch() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
__print_err "<response-code> <policy-id> [count]" $@
pid=$2
ARR=""
while [ $count -lt $max ]; do
- query="/policy?id="$pid
- res="$(__do_curl_to_agent DELETE_BATCH $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/policies/"$UUID$pid
+ else
+ query="/policy?id="$UUID$pid
+ fi
+ res="$(__do_curl_to_api PA DELETE_BATCH $query)"
status=${res:${#res}-3}
- echo -ne " Requested(batch) "$count"("$max")${SAMELINE}"
+ echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"
if [ $status -ne 200 ]; then
- let pid=$pid+1
echo " Requested(batch) "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status 200 (in request), got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code 200 $status
return 1
fi
cid=${res:0:${#res}-3}
count=0
for cid in $ARR; do
- res="$(__do_curl_to_agent RESPONSE $cid)"
+ res="$(__do_curl_to_api PA RESPONSE $cid)"
status=${res:${#res}-3}
- echo -ne " Deleted(batch) "$count"("$max")${SAMELINE}"
+ echo -ne " Deleting(batch) "$count"("$max")${SAMELINE}"
if [ $status -ne $1 ]; then
- let pid=$pid+1
echo " Deleted(batch) "$count"?("$max")"
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
echo -ne " Deleted(batch) "$count"("$max")${SAMELINE}"
done
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ echo ""
+
+ __log_test_pass
return 0
}
-# API Test function: DELETE /policy to run in i parallel for a number of rics
+# API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in i parallel for a number of rics
# args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
# (Function for test scripts)
api_delete_policy_parallel() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -ne 5 ]; then
__print_err " <response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>" $@
count=$1; shift;
pids=$1; shift;
- if [ $ADAPTER != $RESTBASE ] && [ $ADAPTER != $RESTBASE_SECURE ]; then
+ #if [ $PA_ADAPTER != $RESTBASE ] && [ $PA_ADAPTER != $RESTBASE_SECURE ]; then
+ if [ $PA_ADAPTER_TYPE != "REST" ]; then
echo " Info - api_delete_policy_parallel uses only the agent REST interface - create over dmaap in parallel is not supported"
echo " Info - will execute over agent REST"
fi
- query="/policy"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="$PMS_API_PREFIX/v2/policies/"
+ else
+ query="/policy"
+ fi
- urlbase=${ADAPTER}${query}
+ urlbase=${PA_ADAPTER}${query}
+
+ httpproxy="NOPROXY"
+ if [ ! -z "$KUBE_PROXY_PATH" ]; then
+ httpproxy=$KUBE_PROXY_PATH
+ fi
for ((i=1; i<=$pids; i++))
do
- echo "" > ".pid${i}.del.res.txt"
- echo $resp_code $urlbase $num_rics $start_id $count $pids $i > ".pid${i}.del.txt"
+ uuid=$UUID
+ if [ -z "$uuid" ]; then
+ uuid="NOUUID"
+ fi
+ echo "" > "./tmp/.pid${i}.del.res.txt"
+ echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy> "./tmp/.pid${i}.del.txt"
echo $i
done | xargs -n 1 -I{} -P $pids bash -c '{
arg=$(echo {})
echo " Parallel process $arg started"
- tmp=$(< ".pid${arg}.del.txt")
- python3 ../common/delete_policies_process.py $tmp > .pid${arg}.del.res.txt
+ tmp=$(< "./tmp/.pid${arg}.del.txt")
+ python3 ../common/delete_policies_process.py $tmp > ./tmp/.pid${arg}.del.res.txt
}'
msg=""
for ((i=1; i<=$pids; i++))
do
- file=".pid${i}.del.res.txt"
+ file="./tmp/.pid${i}.del.res.txt"
tmp=$(< $file)
if [ -z "$tmp" ]; then
echo " Process $i : unknown result (result file empty"
else
res=${tmp:0:1}
if [ $res == "0" ]; then
- echo " Process $i : OK"
+ echo " Process $i : OK - "${tmp:1}
else
echo " Process $i : failed - "${tmp:1}
msg="failed"
fi
done
if [ -z $msg ]; then
- echo " $(($count*$num_rics)) deleted"
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass " $(($count*$num_rics)) policy request(s) executed"
return 0
fi
- echo -e $RED" FAIL. One of more processes failed to execute" $ERED
- ((RES_FAIL++))
+ __log_test_fail_general "One of more processes failed to execute"
return 1
}
-# API Test function: GET /policy_ids
+# API Test function: GET /policy_ids and V2 GET /v2/policies
# args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)
# (Function for test scripts)
api_get_policy_ids() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 4 ]; then
__print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)" $@
queryparams=""
- if [ $2 != "NORIC" ]; then
- queryparams="?ric="$2
- fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $2 != "NORIC" ]; then
+ queryparams="?ric_id="$2
+ fi
- if [ $3 != "NOSERVICE" ]; then
- if [ -z $queryparams ]; then
- queryparams="?service="$3
- else
- queryparams=$queryparams"&service="$3
+ if [ $3 != "NOSERVICE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?service_id="$3
+ else
+ queryparams=$queryparams"&service_id="$3
+ fi
fi
- fi
- if [ $4 != "NOTYPE" ]; then
- if [ -z $queryparams ]; then
- queryparams="?type="$4
- else
- queryparams=$queryparams"&type="$4
+ if [ $4 != "NOTYPE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?policytype_id="$4
+ else
+ queryparams=$queryparams"&policytype_id="$4
+ fi
+ fi
+
+ query="/v2/policies"$queryparams
+ else
+ if [ $2 != "NORIC" ]; then
+ queryparams="?ric="$2
+ fi
+
+ if [ $3 != "NOSERVICE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?service="$3
+ else
+ queryparams=$queryparams"&service="$3
+ fi
+ fi
+ if [ $4 != "NOTYPE" ]; then
+ if [ -z $queryparams ]; then
+ queryparams="?type="$4
+ else
+ queryparams=$queryparams"&type="$4
+ fi
fi
+
+ query="/policy_ids"$queryparams
fi
- query="/policy_ids"$queryparams
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
targetJson=$targetJson","
fi
if [ $pid != "NOID" ]; then
- targetJson=$targetJson"\"$pid\""
+ targetJson=$targetJson"\"$UUID$pid\""
fi
done
targetJson=$targetJson"]"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"policy_ids\": $targetJson}"
+ fi
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+
+ __log_test_pass
+ return 0
+}
+
+# API Test function: V2 GET /v2/policy-types/{policyTypeId}
+# args(V2): <response-code> <policy-type-id> [<schema-file>]
+# (Function for test scripts)
+api_get_policy_type() {
+ __log_test_start $@
+
+ if [ "$PMS_VERSION" != "V2" ]; then
+ __log_test_fail_not_supported
+ return 1
+ fi
+
+ if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+ __print_err "<response-code> <policy-type-id> [<schema-file>]" $@
+ return 1
+ fi
+ query="/v2/policy-types/$2"
+
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
+
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
+ return 1
+ fi
+
+ if [ $# -eq 3 ]; then
+
+ body=${res:0:${#res}-3}
+
+ targetJson=$(< $3)
+ targetJson="{\"policy_schema\":$targetJson}"
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
# args: <response-code> <policy-type-id> [<schema-file>]
# (Function for test scripts)
api_get_policy_schema() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
+
+ if [ "$PMS_VERSION" == "V2" ]; then
+ __log_test_fail_not_supported
+ return 1
+ fi
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
__print_err "<response-code> <policy-type-id> [<schema-file>]" $@
return 1
fi
-
query="/policy_schema?id=$2"
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
body=${res:0:${#res}-3}
targetJson=$(< $3)
+
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
# API Test function: GET /policy_schemas
# args: <response-code> <ric-id>|NORIC [<schema-file>|NOFILE]*
+# args(V2): <response-code>
# (Function for test scripts)
api_get_policy_schemas() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
-
- if [ $# -lt 2 ]; then
- __print_err "<response-code> <ric-id>|NORIC [<schema-file>|NOFILE]*" $@
- return 1
- fi
+ __log_test_start $@
- query="/policy_schemas"
- if [ $2 != "NORIC" ]; then
- query=$query"?ric="$2
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -ne 1 ]; then
+ __print_err "<response-code>" $@
+ return 1
+ fi
+ else
+ if [ $# -lt 2 ]; then
+ __print_err "<response-code> <ric-id>|NORIC [<schema-file>|NOFILE]*" $@
+ return 1
+ fi
+ fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/policy-schemas"
+ else
+ query="/policy_schemas"
+ if [ $2 != "NORIC" ]; then
+ query=$query"?ric="$2
+ fi
fi
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
done
targetJson=$targetJson"]"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"policy_schemas\": $targetJson }"
+ fi
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: GET /policy_status
-# arg: <response-code> <policy-id> (STD <enforce-status> [<reason>])|(OSC <instance-status> <has-been-deleted>)
+# API Test function: GET /policy_status and V2 GET /policies/{policy_id}/status
+# arg: <response-code> <policy-id> (STD|STD2 <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>)
# (Function for test scripts)
api_get_policy_status() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
+
if [ $# -lt 4 ] || [ $# -gt 5 ]; then
- __print_err "<response-code> <policy-id> (STD <enforce-status> [<reason>])|(OSC <instance-status> <has-been-deleted>)" $@
+ __print_err "<response-code> <policy-id> (STD <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>)" $@
return 1
fi
targetJson=$targetJson",\"reason\":\"$5\""
fi
targetJson=$targetJson"}"
+ elif [ $3 == "STD2" ]; then
+ if [ $4 == "EMPTY" ]; then
+ targetJson="{\"enforceStatus\":\"\""
+ else
+ targetJson="{\"enforceStatus\":\"$4\""
+ fi
+ if [ $# -eq 5 ]; then
+ if [ $5 == "EMPTY" ]; then
+ targetJson=$targetJson",\"enforceReason\":\"\""
+ else
+ targetJson=$targetJson",\"enforceReason\":\"$5\""
+ fi
+ fi
+ targetJson=$targetJson"}"
elif [ $3 == "OSC" ]; then
targetJson="{\"instance_status\":\"$4\""
if [ $# -eq 5 ]; then
return 1
fi
- query="/policy_status?id="$2
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/policies/$UUID$2/status"
+ targetJson="{\"last_modified\":\"????\",\"status\":$targetJson}"
+ else
+ query="/policy_status?id="$UUID$2
+ fi
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API Test function: GET /policy_types
+# API Test function: GET /policy_types and V2 GET /v2/policy-types
# args: <response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]
# (Function for test scripts)
api_get_policy_types() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 1 ]; then
__print_err "<response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]" $@
return 1
fi
- if [ $# -eq 1 ]; then
- query="/policy_types"
- elif [ $2 == "NORIC" ]; then
- query="/policy_types"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -eq 1 ]; then
+ query="/v2/policy-types"
+ elif [ $2 == "NORIC" ]; then
+ query="/v2/policy-types"
+ else
+ query="/v2/policy-types?ric_id=$2"
+ fi
else
- query="/policy_types?ric=$2"
+ if [ $# -eq 1 ]; then
+ query="/policy_types"
+ elif [ $2 == "NORIC" ]; then
+ query="/policy_types"
+ else
+ query="/policy_types?ric=$2"
+ fi
fi
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
done
targetJson=$targetJson"]"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"policytype_ids\": $targetJson }"
+ fi
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
#### Test case functions Health check
#########################################################
-# API Test function: GET /status
+# API Test function: GET /status and V2 GET /status
# args: <response-code>
# (Function for test scripts)
api_get_status() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -ne 1 ]; then
__print_err "<response-code>" $@
return 1
fi
- query="/status"
- res="$(__do_curl_to_agent GET $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/status"
+ else
+ query="/status"
+ fi
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
#### Test case functions RIC Repository
#########################################################
-# API Test function: GET /ric
+# API Test function: GET /ric and V2 GET /v2/rics/ric
# args: <reponse-code> <management-element-id> [<ric-id>]
+# (V2) args: <reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [<string-of-ricinfo>]
+# (V2) example of <string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4"
+# (V2) format of ric-info: <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
+
+
# (Function for test scripts)
api_get_ric() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
- if [ $# -lt 2 ] || [ $# -gt 3 ]; then
- __print_err "<reponse-code> <management-element-id> [<ric-id>]" $@
- return 1
- fi
+ __log_test_start $@
- query="/ric?managedElementId="$2
+ if [ "$PMS_VERSION" == "V2" ]; then
+ if [ $# -lt 3 ]; then
+ __print_err "<reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [string-of-ricinfo>]" $@
+ return 1
+ fi
+ search=""
+ if [ $2 != "NOME" ]; then
+ search="?managed_element_id="$2
+ fi
+ if [ $3 != "NORIC" ]; then
+ if [ -z $search ]; then
+ search="?ric_id="$3
+ else
+ search=$search"&ric_id="$3
+ fi
+ fi
+ query="/v2/rics/ric"$search
- res="$(__do_curl_to_agent GET $query)"
- status=${res:${#res}-3}
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
- if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
- return 1
- fi
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
+ return 1
+ fi
- if [ $# -eq 3 ]; then
- body=${res:0:${#res}-3}
- if [ "$body" != "$3" ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ if [ $# -gt 3 ]; then
+ body=${res:0:${#res}-3}
+ res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V2" "$4" )
+ if [ $res -ne 0 ]; then
+ __log_test_fail_general "Could not create target ric info json"
+ return 1
+ fi
+
+ targetJson=$(<./tmp/.tmp_rics.json)
+ targetJson=${targetJson:1:${#targetJson}-2} #remove array brackets
+ echo " TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+ else
+ if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+ __print_err "<reponse-code> <management-element-id> [<ric-id>]" $@
+ return 1
+ fi
+
+ query="/ric?managedElementId="$2
+
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
+
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
return 1
fi
- fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ if [ $# -eq 3 ]; then
+ body=${res:0:${#res}-3}
+ if [ "$body" != "$3" ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+ fi
+ __log_test_pass
return 0
}
-# API test function: GET /rics
+# API test function: GET /rics and V2 GET /v2/rics
# args: <reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]
# example of <space-separate-string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4 ricsim_g1_1:me2_........."
# format of ric-info: <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
# (Function for test scripts)
api_get_rics() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 2 ]; then
__print_err "<reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]" $@
return 1
fi
- query="/rics"
- if [ $2 != "NOTYPE" ]; then
- query="/rics?policyType="$2
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/rics"
+ if [ $2 != "NOTYPE" ]; then
+ query="/v2/rics?policytype_id="$2
+ fi
+ else
+ query="/rics"
+ if [ $2 != "NOTYPE" ]; then
+ query="/rics?policyType="$2
+ fi
fi
- res="$(__do_curl_to_agent GET $query)"
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
if [ $# -gt 2 ]; then
body=${res:0:${#res}-3}
- res=$(python3 ../common/create_rics_json.py ".tmp_rics.json" "$3" )
+ if [ "$PMS_VERSION" == "V2" ]; then
+ res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V2" "$3" )
+ else
+ res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V1" "$3" )
+ fi
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, could not create target ric info json"$ERED
- ((RES_FAIL++))
+ __log_test_fail_general "Could not create target ric info json"
return 1
fi
- targetJson=$(<.tmp_rics.json)
+ targetJson=$(<./tmp/.tmp_rics.json)
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"rics\": $targetJson }"
+ fi
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
#### API Test case functions Service registry and supervision ####
##################################################################
-# API test function: PUT /service
+# API test function: PUT /service and V2 PUT /service
# args: <response-code> <service-name> <keepalive-timeout> <callbackurl>
# (Function for test scripts)
api_put_service() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -ne 4 ]; then
__print_err "<response-code> <service-name> <keepalive-timeout> <callbackurl>" $@
return 1
fi
- query="/service"
- json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceName\": \""$2"\"}"
- file=".tmp.json"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/services"
+ json="{\"callback_url\": \""$4"\",\"keep_alive_interval_seconds\": \""$3"\",\"service_id\": \""$2"\"}"
+ else
+ query="/service"
+ json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceName\": \""$2"\"}"
+ fi
+ file="./tmp/.tmp.json"
echo "$json" > $file
- res="$(__do_curl_to_agent PUT $query $file)"
+ res="$(__do_curl_to_api PA PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API test function: GET /services
+# API test function: GET /services and V2 GET /v2/services
#args: <response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) | (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]
# (Function for test scripts)
api_get_services() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
#Number of accepted parameters: 1, 2, 4, 7, 10, 13,...
paramError=1
if [ $# -eq 1 ]; then
return 1
fi
- query="/services"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/services"
- if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
- query="/services?name="$2
- fi
+ if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
+ query="/v2/services?service_id="$2
+ fi
+ else
+ query="/services"
- res="$(__do_curl_to_agent GET $query)"
+ if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
+ query="/services?name="$2
+ fi
+ fi
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
targetJson=$targetJson","
fi
# timeSinceLastActivitySeconds value cannot be checked since value varies
- targetJson=$targetJson"{\"serviceName\": \""$servicename"\",\"keepAliveIntervalSeconds\": "$timeout",\"timeSinceLastActivitySeconds\":\"????\",\"callbackUrl\": \""$callback"\"}"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson=$targetJson"{\"service_id\": \""$servicename"\",\"keep_alive_interval_seconds\": "$timeout",\"time_since_last_activity_seconds\":\"????\",\"callback_url\": \""$callback"\"}"
+ else
+ targetJson=$targetJson"{\"serviceName\": \""$servicename"\",\"keepAliveIntervalSeconds\": "$timeout",\"timeSinceLastActivitySeconds\":\"????\",\"callbackUrl\": \""$callback"\"}"
+ fi
let cntr=cntr+3
done
targetJson=$targetJson"]"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"service_list\": $targetJson }"
+ fi
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API test function: GET /services (only checking service names)
+# API test function: GET /services V2 GET /v2/services - (only checking service names)
# args: <response-code> [<service-name>]*"
# (Function for test scripts)
api_get_service_ids() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -lt 1 ]; then
__print_err "<response-code> [<service-name>]*" $@
return 1
fi
- query="/services"
- res="$(__do_curl_to_agent GET $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/services"
+ else
+ query="/services"
+ fi
+ res="$(__do_curl_to_api PA GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
if [ "$targetJson" != "[" ]; then
targetJson=$targetJson","
fi
- targetJson=$targetJson"{\"callbackUrl\":\"????\",\"keepAliveIntervalSeconds\":\"????\",\"serviceName\":\""$rapp"\",\"timeSinceLastActivitySeconds\":\"????\"}"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson=$targetJson"{\"callback_url\":\"????\",\"keep_alive_interval_seconds\":\"????\",\"service_id\":\""$rapp"\",\"time_since_last_activity_seconds\":\"????\"}"
+ else
+ targetJson=$targetJson"{\"callbackUrl\":\"????\",\"keepAliveIntervalSeconds\":\"????\",\"serviceName\":\""$rapp"\",\"timeSinceLastActivitySeconds\":\"????\"}"
+ fi
done
targetJson=$targetJson"]"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ targetJson="{\"service_list\": $targetJson }"
+ fi
echo "TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
if [ $res -ne 0 ]; then
- echo -e $RED" FAIL, returned body not correct"$ERED
- ((RES_FAIL++))
+ __log_test_fail_body
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API test function: DELETE /services
+# API test function: DELETE /services and V2 DELETE /v2/services/{serviceId}
# args: <response-code> <service-name>
# (Function for test scripts)
api_delete_services() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -ne 2 ]; then
__print_err "<response-code> <service-name>" $@
return 1
fi
-
- query="/services?name="$2
- res="$(__do_curl_to_agent DELETE $query)"
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/services/"$2
+ else
+ query="/services?name="$2
+ fi
+ res="$(__do_curl_to_api PA DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ __log_test_pass
return 0
}
-# API test function: PUT /services/keepalive
+# API test function: PUT /services/keepalive and V2 PUT /v2/services/{service_id}/keepalive
# args: <response-code> <service-name>
# (Function for test scripts)
api_put_services_keepalive() {
- echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
- echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
- ((RES_TEST++))
+ __log_test_start $@
if [ $# -ne 2 ]; then
__print_err "<response-code> <service-name>" $@
return 1
fi
+ if [ "$PMS_VERSION" == "V2" ]; then
+ query="/v2/services/$2/keepalive"
+ else
+ query="/services/keepalive?name="$2
+ fi
- query="/services/keepalive?name="$2
- res="$(__do_curl_to_agent PUT $query)"
+ res="$(__do_curl_to_api PA PUT $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
- echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
- ((RES_FAIL++))
+ __log_test_fail_status_code $1 $status
+ return 1
+ fi
+
+ __log_test_pass
+ return 0
+}
+
+##################################################################
+#### API Test case functions Configuration ####
+##################################################################
+
+# API Test function: PUT /v2/configuration
+# args: <response-code> <config-file>
+# (Function for test scripts)
+api_put_configuration() {
+ __log_test_start $@
+
+ if [ "$PMS_VERSION" != "V2" ]; then
+ __log_test_fail_not_supported
+ return 1
+ fi
+
+ if [ $# -ne 2 ]; then
+ __print_err "<response-code> <config-file>" $@
+ return 1
+ fi
+ if [ ! -f $2 ]; then
+ __log_test_fail_general "Config file "$2", does not exist"
+ return 1
+ fi
+ inputJson=$(< $2)
+ inputJson="{\"config\":"$inputJson"}"
+ file="./tmp/.config.json"
+ echo $inputJson > $file
+ query="/v2/configuration"
+ res="$(__do_curl_to_api PA PUT $query $file)"
+ status=${res:${#res}-3}
+
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
+ return 1
+ fi
+
+ __log_test_pass
+ return 0
+}
+
+# API Test function: GET /v2/configuration
+# args: <response-code> [<config-file>]
+# (Function for test scripts)
+api_get_configuration() {
+ __log_test_start $@
+
+ if [ "$PMS_VERSION" != "V2" ]; then
+ __log_test_fail_not_supported
+ return 1
+ fi
+
+ if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+ __print_err "<response-code> [<config-file>]" $@
+ return 1
+ fi
+ if [ ! -f $2 ]; then
+ __log_test_fail_general "Config file "$2" for comparison, does not exist"
+ return 1
+ fi
+
+ query="/v2/configuration"
+ res="$(__do_curl_to_api PA GET $query)"
+ status=${res:${#res}-3}
+
+ if [ $status -ne $1 ]; then
+ __log_test_fail_status_code $1 $status
return 1
fi
- ((RES_PASS++))
- echo -e $GREEN" PASS"$EGREEN
+ if [ $# -eq 2 ]; then
+
+ body=${res:0:${#res}-3}
+
+ targetJson=$(< $2)
+ targetJson="{\"config\":"$targetJson"}"
+ echo "TARGET JSON: $targetJson" >> $HTTPLOG
+ res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+ if [ $res -ne 0 ]; then
+ __log_test_fail_body
+ return 1
+ fi
+ fi
+
+ __log_test_pass
return 0
}
+##########################################
+#### Reset types and instances ####
+##########################################
+
+# Admin reset to remove all policies and services
+# All types and instances etc are removed - types and instances in a1 sims need to be removed separately
+# NOTE - only works in kubernetes and the pod should not be running
+# args: -
+# (Function for test scripts)
+
+pms_kube_pvc_reset() {
+ __log_test_start $@
+
+ pvc_name=$(kubectl get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep policy)
+ if [ -z "$pvc_name" ]; then
+ pvc_name=policymanagementservice-vardata-pvc
+ fi
+ echo " Trying to reset pvc: "$pvc_name
+ __kube_clean_pvc $POLICY_AGENT_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $POLICY_AGENT_CONTAINER_MNT_DIR
+
+ __log_test_pass
+ return 0
+}
\ No newline at end of file
Code Review / nonrtric.git / blobdiff