Commit 9d973a43 authored by poglitsch's avatar poglitsch
Browse files

pixits correctend

parent e0f541fc

AtsImsIot/AtsImsIot_Behavior.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ module AtsImsIot_Behavior { 
	import from LibSip_Templates all;

	

	import from AtsImsIot_Functions all;

	import from Interface_configuration {modulepar PX_EUT_A, PX_EUT_B;}

	import from LibIot_PIXITS {modulepar PX_EUT_A, PX_EUT_B;}

	

	//TODO move group to Function module

	group general_td_functions {

generic_interface_configuration/Interface_configuration.ttcn→AtsImsIot/AtsImsIot_PIXITS.ttcn

+74 −0
Original line number Diff line number Diff line 
module Interface_configuration {

	

	/**

	 * 

	 * @desc IP address type e.g. "127.0.0.1" 

	 */

	type charstring IpAddress;

	

	/**

	 * 

	 * @desc Type for port number, e.g. "5060" 

	 */

	type integer PortNumber;

	

	/**

	 * 

	 * @desc List of port numbers 

	 */

	type record of PortNumber PortNumberList;

 	

 	/**

 	 * 

 	 * @desc Required information for IP interfaces

 	 * @member domainName the domain name

 	 * @member IpAddress the ip address

 	 * @member portNumbers the list of port numbers where message are received

 	 */

	type record IpInterfaceInfo {

	   charstring domainName optional,

	   IpAddress IpAddress,

	   PortNumberList portNumbers	

	}

 	

 	/**

 	 * 

 	 * @desc List of IP interfacees

 	 */

	type record of IpInterfaceInfo IpInterfaceInfoList;

 	

 	/**

 	 * 

 	 * @desc Collection of different interface types, e.g for IP communications 

 	 */

	type union InterfaceInfo {

	   IpInterfaceInfoList IpInterfaceInfo

	}

	

	/**

	 * 

	 * @desc Type for representing EUT interface information for monitored logical interfaces 

	 * @member interfaceName Name of logical interface

	 * @member interfaceInfo Interface information specific to this logical interface

	 */ 

	type record MonitorInterfaceInfo {

	   charstring interfaceName,

	   InterfaceInfo interfaceInfo	

	}

	

	/**

	 * 

	 * @desc List of monitored interfaces 

	 */

	type record of MonitorInterfaceInfo MonitorInterfaceInfoList;

 

 	/**

 	 * 

 	 * @desc Product specific EUT interface information 

 	 * @member name the name of the vendor

 	 * @member monitorInterfaces monitor interface configuration

 	 */

	type record Product {

	   charstring productName,

	   MonitorInterfaceInfoList monitorInterfaces

	}

	

	/**

	 * 

	 * @desc List of product specificr EUT interface information

	 */

	type record of Product ProductList;

module AtsImsIot_PIXITS {

	

	import from LibIot_TypesAndValues {type ProductList;}



	/**

	 *
@@ -149,11 +71,4 @@ module Interface_configuration { 
	 * @desc Selects product based on index in PX_PRODCUTS vendor list for EUT_B

	 */

	modulepar integer PX_EUT_B := 1;



   // TODO functions for information extraction from EUT interface information list (in templates and configuration functions)

   // EXAMPLE: function f_getIPaddress( vendor, interface name) returns IPAddressList

   

   // TODO Investigate set of "ATS specific" functions for simplifying data entry to EUT interface information list



	

}
 
 No newline at end of file

AtsImsIot/AtsImsIot_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ module AtsImsIot_TestCases { 


	import from LibIms_UpperTester {type ImsUserInfo;}



	import from Interface_configuration {modulepar PX_EUT_A, PX_EUT_B;}

	import from LibIot_PIXITS {modulepar PX_EUT_A, PX_EUT_B;}



	import from AtsImsIot_Functions {function all;}

AtsImsIot/AtsImsIot_TestConfiguration.ttcn

+17 −18
Original line number Diff line number Diff line
@@ -9,10 +9,7 @@ 


module AtsImsIot_TestConfiguration {

	

	import from Interface_configuration {

		modulepar PX_EUT_A, PX_EUT_B, PX_PRODUCTS;

		type InterfaceInfo, Product;

	}

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



	import from LibIot_Functions {

        function f_setConformanceVerdict, f_setE2EVerdict;
@@ -24,7 +21,9 @@ module AtsImsIot_TestConfiguration { 


	import from LibIot_TypesAndValues {

        type

            InterfaceInfo,

            InterfaceInfoList,

            Product,

            ProtocolFilter,

            SetFilterReq,

            SetFilterRsp,
@@ -235,7 +234,7 @@ module AtsImsIot_TestConfiguration { 
    		p_Mw := f_cf_create_monitor(c_mw);

    		if(p_useGmB) {

    			p_GmB := f_cf_create_monitor(c_gm_B);

    			f_cf_monitor_up(p_GmB);

    			f_cf_monitor_up(valueof(p_GmB));

    		}

    		

    		f_cf_monitor_up(p_GmA);

AtsImsIot/AtsImsIot_TypesAndValues.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ module AtsImsIot_TypesAndValues { 
		

		type record SkipType {

			integer skipCount,

			SipMessage skipMessage

			SipMessage skipMessage optional

		} 

	}