Integrated PMS 2.0 to test env and test cases

[nonrtric.git] / test / auto-test / FTC310.sh

diff --git a/test/auto-test/FTC310.sh b/test/auto-test/FTC310.sh
index 18d6816..bf5785e 100755 (executable)
--- a/test/auto-test/FTC310.sh
+++ b/test/auto-test/FTC310.sh
@@ -20,8 +20,8 @@
 
 TC_ONELINE_DESCR="Resync of RIC via changes in the consul config"
 
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="SDNC_ONAP"
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
 
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
@@ -30,6 +30,7 @@ EXCLUDED_IMAGES="SDNC_ONAP"
 
 #### TEST BEGIN ####
 
+generate_uuid
 
 # Clean container and start all needed containers #
 clean_containers
@@ -37,6 +38,9 @@ clean_containers
 # Start one RIC of each type
 start_ric_simulators ricsim_g1 1  OSC_2.1.0
 start_ric_simulators ricsim_g2 1  STD_1.1.3
+if [ "$PMS_VERSION" == "V2" ]; then
+    start_ric_simulators ricsim_g3 1  STD_2.0.0
+fi
 
 start_mr
 
@@ -52,29 +56,41 @@ start_control_panel
 
 start_policy_agent
 
-api_equal json:rics 2 120
+if [ "$PMS_VERSION" == "V2" ]; then
+    api_equal json:rics 3 120
+else
+    api_equal json:rics 2 120
+fi
 
 
-# Add an OSC RIC and check
+# Add an STD RIC and check
 start_ric_simulators ricsim_g2 2  STD_1.1.3
 
 prepare_consul_config      NOSDNC  ".consul_config.json"
 
 consul_config_app                  ".consul_config.json"
 
-api_equal json:rics 3 120
+if [ "$PMS_VERSION" == "V2" ]; then
+    api_equal json:rics 4 120
+else
+    api_equal json:rics 3 120
+fi
 
 check_policy_agent_logs
 check_control_panel_logs
 
-# Remove one OSC RIC and check
+# Remove one RIC RIC and check
 start_ric_simulators ricsim_g2 1  STD_1.1.3
 
 prepare_consul_config      NOSDNC  ".consul_config.json"
 
 consul_config_app                  ".consul_config.json"
 
-api_equal json:rics 2 120
+if [ "$PMS_VERSION" == "V2" ]; then
+    api_equal json:rics 3 120
+else
+    api_equal json:rics 2 120
+fi
 
 check_policy_agent_logs
 check_control_panel_logs