X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC10.sh;h=42b8f587b40abe7e83d853edce0352542287719b;hb=045a1503113be9e0ff6e0747c94d23e06ddb263f;hp=58128b78b59e50fde877bcea060d885d61eaf294;hpb=72667f1d4b9e534b38b206f64f2ac67df01a2ed9;p=nonrtric.git

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index 58128b78..42b8f587 100755
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #  ============LICENSE_START===============================================
 #  Copyright (C) 2020 Nordix Foundation. All rights reserved.
@@ -17,7 +17,10 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="Basic use case, register rapp, create/update policy, delete policy, de-register rapp using both STD and OSC interface over REST and Dmaap"
+TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST and Dmaap"
+
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM"
 
 . ../common/testcase_common.sh $@
 . ../common/agent_api_functions.sh
@@ -25,11 +28,19 @@ TC_ONELINE_DESCR="Basic use case, register rapp, create/update policy, delete po
 
 #### TEST BEGIN ####
 
+generate_uuid
+
 #Local vars in test script
 ##########################
 # Path to callback receiver
 CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
 
+use_cr_http
+use_simulator_http
+use_mr_http
+use_agent_rest_http
+
+
 clean_containers
 
 start_ric_simulators  ricsim_g1 3 OSC_2.1.0
@@ -67,30 +78,30 @@ api_equal json:policy_types 2 60
 # Create policies
 use_agent_rest_http
 
-api_put_service 201 "rapp1" 3600 "$CR_PATH/1"
+api_put_service 201 "service1" 3600 "$CR_PATH/1"
 
-api_put_policy 201 "rapp1" ricsim_g1_1 1 2000 testdata/OSC/pi1_template.json 1
+api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
 sim_equal ricsim_g1_1 num_instances 1
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
-api_put_policy 201 "rapp1" ricsim_g1_1 1 3000 testdata/OSC/pi1_template.json 1
+api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
 sim_equal ricsim_g1_1 num_instances 2
 
 
 use_agent_rest_http
 
-api_put_policy 201 "rapp1" ricsim_g2_1 NOTYPE 2100 testdata/STD/pi1_template.json 1
+api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
 sim_equal ricsim_g2_1 num_instances 1
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
-api_put_policy 201 "rapp1" ricsim_g2_1 NOTYPE 3100 testdata/STD/pi1_template.json 1
+api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
 sim_equal ricsim_g2_1 num_instances 2
 
@@ -98,16 +109,16 @@ sim_equal ricsim_g2_1 num_instances 2
 #Update policies
 use_agent_rest_http
 
-api_put_service 200 "rapp1" 3600 "$CR_PATH/callbacks/1"
+api_put_service 200 "service1" 3600 "$CR_PATH/1"
 
-api_put_policy 200 "rapp1" ricsim_g1_1 1 2000 testdata/OSC/pi1_template.json 1
+api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
 sim_equal ricsim_g1_1 num_instances 2
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
-api_put_policy 200 "rapp1" ricsim_g1_1 1 3000 testdata/OSC/pi1_template.json 1
+api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT testdata/OSC/pi1_template.json 1
 
 sim_equal ricsim_g1_1 num_instances 2
 
@@ -115,14 +126,14 @@ sim_equal ricsim_g1_1 num_instances 2
 use_agent_rest_http
 
 
-api_put_policy 200 "rapp1" ricsim_g2_1 NOTYPE 2100 testdata/STD/pi1_template.json 1
+api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
 sim_equal ricsim_g2_1 num_instances 2
 
 
-use_agent_dmaap
+use_agent_dmaap_http
 
-api_put_policy 200 "rapp1" ricsim_g2_1 NOTYPE 3100 testdata/STD/pi1_template.json 1
+api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT testdata/STD/pi1_template.json 1
 
 sim_equal ricsim_g2_1 num_instances 2
 
@@ -134,11 +145,11 @@ api_get_policy 200 3100 testdata/STD/pi1_template.json
 
 # Remove policies
 
-use_agent_dmaap
+use_agent_dmaap_http
 api_delete_policy 204 2000
 use_agent_rest_http
 api_delete_policy 204 3000
-use_agent_dmaap
+use_agent_dmaap_http
 api_delete_policy 204 2100
 use_agent_rest_http
 api_delete_policy 204 3100
@@ -146,6 +157,11 @@ api_delete_policy 204 3100
 sim_equal ricsim_g1_1 num_instances 0
 sim_equal ricsim_g2_1 num_instances 0
 
+# Check remote host access to simulator
+
+sim_contains_str ricsim_g1_1 remote_hosts "policy-agent"
+sim_contains_str ricsim_g2_1 remote_hosts "policy-agent"
+
 # Check policy removal
 use_agent_rest_http
 api_get_policy 404 2000
@@ -154,10 +170,10 @@ api_get_policy 404 2100
 api_get_policy 404 3100
 
 # Remove the service
-use_agent_dmaap
-api_delete_services 204 "rapp1"
+use_agent_dmaap_http
+api_delete_services 204 "service1"
 
-api_get_services 404 "rapp1"
+api_get_services 404 "service1"
 
 
 
@@ -167,4 +183,6 @@ check_policy_agent_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result
+
+auto_clean_containers
\ No newline at end of file