Commit a7b6604e authored by ringst's avatar ringst
Browse files

PX_AVAILABLE_INTERFACES added, interfaces that are not available can be...

PX_AVAILABLE_INTERFACES added, interfaces that are not available can be selected as not to be considered in the test evaluation
parent 549e361d
Loading
Loading
Loading
Loading
+23 −9
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module AtsImsIot_Functions {
 		type ImsTestCoordinator, ImsInterfaceMonitor;
 	}

 	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT, PX_PRODUCTS;}
 	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT, PX_PRODUCTS, PX_AVAILABLE_INTERFACES;}
	import from LibIot_Functions {
		function f_setConformanceVerdict;
	}
@@ -1216,6 +1216,10 @@ module AtsImsIot_Functions {
        
	}// end group
 	
 	function f_setInterfaceNameOnComponent(charstring p_name) runs on ImsInterfaceMonitor{
 		vc_interfaceName := p_name;
 	}
 	
	group general_td_functions {

		/**
@@ -1271,17 +1275,27 @@ module AtsImsIot_Functions {

            var integer v_size := lengthof(p_failCriteria); 
            var DefaultList v_defaultArray;

			var integer i := 0;
			var integer v_size_ai := sizeof(PX_AVAILABLE_INTERFACES);
			
			// check if interface is available
			for(i := 0; i < v_size_ai; i := i+1) {
				if (PX_AVAILABLE_INTERFACES[i].interfaceName == vc_interfaceName and 
					PX_AVAILABLE_INTERFACES[i].available == false) {
					setverdict(inconc, self, "******f_imsIot_receive: Interface " & PX_AVAILABLE_INTERFACES[i].interfaceName & " not available and is not evaluated******" );
				} else {
					v_defaultArray[0] := activate(a_default(p_tpId));
					f_activateImsSipDefaults(v_defaultArray, 1, p_failCriteria, fail, p_tpId, p_forwardMtc, p_checkMessage);
					f_activateImsSipDefaults(v_defaultArray, v_size + 1, p_passCriteria, pass, p_tpId, p_forwardMtc, p_checkMessage);

					f_gen_receive(p_tpId, p_skip);

			for (var integer i := 0; i < sizeof(v_defaultArray); i := i + 1) {
					for (i := 0; i < sizeof(v_defaultArray); i := i + 1) {
						deactivate(v_defaultArray[i]);
					}
				}	
			}            
		}
		
		/**
         * @desc This function implements skipping of messages as well as timeout handling.
+37 −41
Original line number Diff line number Diff line
@@ -15,12 +15,9 @@ module AtsImsIot_TestConfiguration {

	import from AtsImsIot_TestSystem {type CF_INT_CALL, CF_INT_AS, CF_ROAM_AS;}

	import from LibIot_PIXITS {
        modulepar PX_EUT_A, PX_EUT_B, PX_PRODUCTS, PX_MAX_MSG_WAIT;
    }
	import from LibIot_PIXITS {modulepar PX_EUT_A, PX_EUT_B, PX_PRODUCTS, PX_MAX_MSG_WAIT;}

	import from LibIot_Functions language "TTCN-3:2008 Amendment 1" {
        altstep a_receiveIOTVerdict;
	import from LibIot_Functions {
				function f_setConformanceVerdict, f_setE2EVerdict;
		}

@@ -36,8 +33,7 @@ module AtsImsIot_TestConfiguration {
			m_startTrafficCaptureReq,
			m_stopTrafficCaptureReq,
			m_startTrafficCaptureRsp_any,
            m_stopTrafficCaptureRsp_any;
    }
			m_stopTrafficCaptureRsp_any;}

	import from LibCommon_VerdictControl {type FncRetCode;}

@@ -64,6 +60,8 @@ module AtsImsIot_TestConfiguration {

	import from LibIot_TestInterface {type IotEquipmentUser;}
	
	import from AtsImsIot_Functions {function f_setInterfaceNameOnComponent;}
	
	
	group constantDefinitions {
		//* interface monitor name Gm A
@@ -209,6 +207,8 @@ module AtsImsIot_TestConfiguration {
			*/	
			function f_cf_create_monitor(in charstring p_name) runs on ImsTestCoordinator return ImsInterfaceMonitor {
				var ImsInterfaceMonitor v_monitor := ImsInterfaceMonitor.create(p_name) alive;
				v_monitor.start(f_setInterfaceNameOnComponent(p_name));
				v_monitor.done;				 
				return v_monitor; 
			}
	}
@@ -216,9 +216,6 @@ module AtsImsIot_TestConfiguration {
	
	group testConfiguration {
		
		
		
		
		/**
		 * @desc
		 *     Test configuration function for roaming registration szenario.
@@ -357,7 +354,6 @@ module AtsImsIot_TestConfiguration {
				// Initialize the Adapter (including the TrafficCapture process).
				timer tc_configureGuard;
				var StartTrafficCaptureRsp startResult;
				activate(a_receiveIOTVerdict());
				tc_configureGuard.start(PX_MAX_MSG_WAIT);
				acPort.send(m_generalConfigurationReq_offline);
				alt {