Updates for F release
Removed usage of Consul/CBS (docker only) in tests for F-release and Jakarta
Added test of initial config map for PMS in kubernetes
Added a few “missing” non 2XX rest case tests for PMS
Added tests for dmaap mediator kafka types
Added test case with multiple types for dmaap mediator and adaptor
Updated test of HelmChart (from it/dep example recipe)
Updates of README files
Added feature to collect http endpoint statistics for PMS
Added feature to delete namespace (kube) and containers (docker) prior to test - if label by the test env.
Added couter in callback receiver to count batches (when more then one message is delivered in an array)
Added test suite and override file for aegis image testing
Updated Jakrata sdnc test with changed api url and json payload
Issue-ID: NONRTRIC-690
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I5e80bb136d089b04ca9e519ce71df0b4a450bae2
diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index 7c1202c..c09bbad 100755
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -30,7 +30,7 @@
#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
#the image is not configured in the supplied env_file
#Used for images not applicable to all supported profile
-CONDITIONALLY_IGNORED_IMAGES="NGW"
+CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW"
#Supported test environment profiles
SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE"
@@ -79,16 +79,17 @@
start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE
-if [ $RUNMODE == "DOCKER" ]; then
- start_consul_cbs
-fi
-
prepare_consul_config NOSDNC ".consul_config.json"
if [ $RUNMODE == "KUBE" ]; then
agent_load_config ".consul_config.json"
else
- consul_config_app ".consul_config.json"
+ if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then
+ api_put_configuration 200 ".consul_config.json"
+ else
+ start_consul_cbs
+ consul_config_app ".consul_config.json"
+ fi
fi
start_cr 1