Commit 126e5dfc authored by berge's avatar berge
Browse files

Various adjustments

parent a981c434

AtsImsIot/AtsImsIot_Behavior.ttcn

+5 −3
Original line number Diff line number Diff line
@@ -3078,8 +3078,10 @@ group checksTC_IMS_SS_0003 { 
    		boolean p_checkMessage

    	) runs on ImsTestCoordinator  {

			

			var template SipUrl v_AS_IMS_B := mw_SipUrl_Host(f_GetEUTASServerAddress(PX_EUT_B));

			var template SipUrl v_SCSCF_IMS_B := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B));

			var template SipUrl v_AS_IMS_B := (mw_SipUrl_Host(f_GetEUTASServerAddress(PX_EUT_B)), 

														mw_SipUrl_Host(f_GetEUTASServerIpAddress(PX_EUT_B)));

			var template SipUrl v_SCSCF_IMS_B := (mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B)), 

															mw_SipUrl_Host(f_GetEUTScscfIpAddress(PX_EUT_B)));

    			

    		p_monitorCompRef.start(

    		 f_imsIot_receive(

AtsImsIot/AtsImsIot_Functions.ttcn

+37 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,43 @@ module AtsImsIot_Functions { 


 	}

 

   		/**

    	 * @desc Get the AS server IP Address  of referenced EUT 

    	 */

     	function f_GetEUTASServerIpAddress(integer p_ProductIdx) return charstring {

           var integer v_size_interfaces := sizeof(PX_PRODUCTS[p_ProductIdx].monitorInterfaces);

           var integer v_size_ipinterfaceinfo;

           var integer v_interface := -1;

           var integer v_ipinterfaceinfo := -1;

           var charstring v_domainname;

      

           for(var integer i := 0; i < v_size_interfaces; i := i+1) {

            if (match(PX_PRODUCTS[p_ProductIdx].monitorInterfaces[i].interfaceName, pattern "[Ii][Ss][Cc]")){

             v_interface := i;

            }

           }

           if (v_interface > -1) {

            v_size_ipinterfaceinfo := sizeof(PX_PRODUCTS[p_ProductIdx].monitorInterfaces[v_interface].interfaceInfo.IpInterfaceInfo);

               for(var integer i := 0; i < v_size_ipinterfaceinfo; i := i+1) {

                v_domainname := PX_PRODUCTS[p_ProductIdx].monitorInterfaces[v_interface].interfaceInfo.IpInterfaceInfo[i].domainName;

                if (match(substr(v_domainname, 0, 2), pattern "[Aa][Ss]") 

                or match(substr(v_domainname, 2, 2), pattern "[Aa][Ss]")

                or (lengthof(v_domainname) >= 11 and match(substr(v_domainname, 9, 2), pattern "[Aa][Ss]"))) {

                 v_ipinterfaceinfo := i;

                }

               }

           } else {

            log ("AS of " & PX_PRODUCTS[p_ProductIdx].productName & " not found.");

            return "AS of " & PX_PRODUCTS[p_ProductIdx].productName & " not found.";

           }

           if (v_ipinterfaceinfo > -1) {

            return PX_PRODUCTS[p_ProductIdx].monitorInterfaces[v_interface].interfaceInfo.IpInterfaceInfo[v_ipinterfaceinfo].IpAddress;

           } else {

            log ("AS of " & PX_PRODUCTS[p_ProductIdx].productName & " not found.");

            return "AS of " & PX_PRODUCTS[p_ProductIdx].productName & " not found.";

           }

     	}



 

 	group interComponent {

 		/**

AtsImsIot/AtsImsIot_TestCases_MESS.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ module AtsImsIot_TestCases_MESS { 
		// test body

		f_mtc_userSendMessage(v_ueA, "test"); 

		

		f_mtc_check_TP_IMS_5097_05_gm(v_gmA, true); // message not removed from port queue

		f_mtc_check_TP_IMS_5097_07_gm(v_gmA, false); // message removed from port queue

		f_mtc_check_TP_IMS_5097_05_mw(v_mw, true);// message not removed from port queue

		f_mtc_check_TP_IMS_5097_07_mw(v_mw, false);// message removed from port queue

		f_mtc_check_TP_IMS_5097_05_gm(v_gmA, false); // message not removed from port queue

		//f_mtc_check_TP_IMS_5097_07_gm(v_gmA, false); // message removed from port queue

		f_mtc_check_TP_IMS_5097_05_mw(v_mw, false);// message not removed from port queue

		//f_mtc_check_TP_IMS_5097_07_mw(v_mw, false);// message removed from port queue

		

		f_mtc_userCheckMessageReceipt(v_ueB);

AtsImsIot/AtsImsIot_TestCases_SS.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userTriggerHold(v_ueB);//Test Sequence Step 7

		

		//check 1 - INVITE(hold)

		f_mtc_check_TP_IMS_5310_01_gm(v_gmB, 1); // Check1 

		f_mtc_check_TP_IMS_5310_01_gm(v_gmB, 0); // Check1 

		f_mtc_check_TP_IMS_5310_01_isc(v_iscB); // Check1 

		

		f_mtc_userCheckUserOnHold(v_ueA);//Test Sequence Step 8