Commit 241681fd authored by garciay's avatar garciay
Browse files

Change PCAP file naming and location: one directory per session, all traces of... 

Change PCAP file naming and location: one directory per session, all traces of the same session are saved using the test case name into its session directory. Into PIXIT file, use PX_IOT_PCAP_SESSIONS_PATH to set the right directory. The Adapter will retrieves the name of the test case running using t3devlib::QName class
Remove useless types and templates
parent 644206da

AtsImsIot/AtsImsIot_Templates.ttcn

+4 −27
Original line number Diff line number Diff line
@@ -34,25 +34,13 @@ module AtsImsIot_Templates { 
	import from LibIot_PIXITS {

		modulepar

			PX_IOT_TIMESTAMP_OFFSET,

			PX_IOT_EXECUTION_FILE,

			PX_IOT_PCAP_SESSIONS_PATH,

			PX_IOT_RECORD_MODE,

			PX_IOT_EUTs_IFACE_INFO_LIST,

			PX_IOT_FILE_MERGE_LIST,

         	PX_IOT_FILE_MERGE_PATH,

         	PX_IOT_MERGE_TOOL_PATH,

         	PX_IOT_IFACES,

         	PX_PROTOCOL_MONITOR1,

        	PX_IP1_MONITOR1,

        	PX_IP2_MONITOR1,

        	PX_PORT_MONITOR1,

        	PX_PROTOCOL_MONITOR2,

        	PX_IP1_MONITOR2,

        	PX_IP2_MONITOR2,

        	PX_PORT_MONITOR2,

        	PX_PROTOCOL_MONITOR3,

        	PX_IP1_MONITOR3,

        	PX_IP2_MONITOR3,

        	PX_PORT_MONITOR3;

         	PX_IOT_IFACES;

	}

	

	group adapterMsgTemplates {
@@ -1649,7 +1637,7 @@ module AtsImsIot_Templates { 
        offlineCapture := {

          offset := PX_IOT_TIMESTAMP_OFFSET,

          captureSource := {

            singleFile := PX_IOT_EXECUTION_FILE,

            sessionsPath := PX_IOT_PCAP_SESSIONS_PATH,

            mergeFileList := {

              mergeFileList := { },

              mergeFilePath := "",
@@ -1717,7 +1705,7 @@ module AtsImsIot_Templates { 
        offlineCapture := {

          offset := PX_IOT_TIMESTAMP_OFFSET,

          captureSource := {

            singleFile := "",

            sessionsPath := "",

            mergeFileList := {

              mergeFileList := PX_IOT_FILE_MERGE_LIST,

              mergeFilePath := PX_IOT_FILE_MERGE_PATH,
@@ -1796,17 +1784,6 @@ module AtsImsIot_Templates { 
        reason := *

      }

    }



  template SetFilterReq m_setFilterReqMonitor1 := 

    m_setFilterReq(PX_PROTOCOL_MONITOR1, PX_IP1_MONITOR1, PX_IP2_MONITOR1, PX_PORT_MONITOR1);

    

  template SetFilterReq m_setFilterReqMonitor2 := 

    m_setFilterReq(PX_PROTOCOL_MONITOR2, PX_IP1_MONITOR2, PX_IP2_MONITOR2, PX_PORT_MONITOR2);

    

  template SetFilterReq m_setFilterReqMonitor3 := 

    m_setFilterReq(PX_PROTOCOL_MONITOR3, PX_IP1_MONITOR3, PX_IP2_MONITOR3, PX_PORT_MONITOR3);

      



  } // adapterTemplates



}//end module

LibIot/LibIot_PIXITS.ttcn

+2 −88
Original line number Diff line number Diff line
@@ -398,9 +398,9 @@ module LibIot_PIXITS { 
		

		/**

		 * @desc

		 *		 In	case of	offline	mode,	it defines the Pcap	file to	play.

		 *		 In	case of	offline	mode,	it defines the path where all sessions's Pcap files are located.

		 */

		modulepar	charstring PX_IOT_EXECUTION_FILE :=	"./TD_IMS_MESS_0001_19.pcap";

		modulepar	charstring PX_IOT_PCAP_SESSIONS_PATH :=	"D:/cygwin/tmp/19";

		

		/**

		 * @desc
@@ -478,90 +478,4 @@ module LibIot_PIXITS { 
		modulepar	integer	PX_NUM_OF_TRIGGER_POINTS :=	1; 

		

	}

	

	group	interfaceData	{

		group	monitor1

		{

			/**

			 * 

			 * @desc protocol	used by	monitoring point #1	 

			 */

			modulepar	ProtocolFilter PX_PROTOCOL_MONITOR1	:= e_sip;

	

			/**

			 * 

			 * @desc First IP	address	used by	monitoring point #1	 

			 */

			modulepar	IpAddress	PX_IP1_MONITOR1	:= "172.31.12.72";

	

			/**

			 * 

			 * @desc Second	IP address used	by monitoring	point	#1	

			 */

			modulepar	IpAddress	PX_IP2_MONITOR1	:= "172.31.42.3";

	

			/**

			 * 

			 * @desc TCP or	UDP	port used	by monitoring	point	#1 

			 */

			 

			modulepar	PortNumber PX_PORT_MONITOR1	:= 5060;

		}

		group	monitor2

		{

			/**

			 * 

			 * @desc protocol	used by	monitoring point #2	 

			 */

			modulepar	ProtocolFilter PX_PROTOCOL_MONITOR2	:= e_sip;

				

			/**

			 * 

			 * @desc First IP	address	used by	monitoring point #2	

			 */

			modulepar	IpAddress	PX_IP1_MONITOR2	:= "172.31.42.4";

	

			/**

			 * 

			 * @desc Second	IP address used	by monitoring	point	#2	

			 */

			modulepar	IpAddress	PX_IP2_MONITOR2	:= "172.31.13.2";

	

			/**

			 * 

			 * @desc TCP or	UDP	port used	by monitoring	point	#2	

			 */

			 

			modulepar	PortNumber PX_PORT_MONITOR2	:= 5060;



		}

		group	monitor3

		{

			/**

			 * 

			 * @desc protocol	used by	monitoring point #3	 

			 */

			modulepar	ProtocolFilter PX_PROTOCOL_MONITOR3	:= e_sip;

				

			/**

			 * 

			 * @desc First IP	address	used by	monitoring point #3

			 */

			modulepar	IpAddress	PX_IP1_MONITOR3	:= "172.31.44.84";

	

			/**

			 * 

			 * @desc Second	IP address used	by monitoring	point	#3

			 */

			modulepar	IpAddress	PX_IP2_MONITOR3	:= "172.31.14.6";

	

			/**

			 * 

			 * @desc TCP or	UDP	port used	by monitoring	point	#3

			 */

			 

			modulepar	PortNumber PX_PORT_MONITOR3	:= 5060;



		}

	}

}
 
 No newline at end of file

LibIot/LibIot_TypesAndValues.ttcn

+248 −249
Original line number Diff line number Diff line
@@ -135,9 +135,8 @@ module LibIot_TypesAndValues { 
    }

    

    type record CaptureSource {

    	charstring singleFile, // e.g., PCAP file

    	charstring sessionsPath, // e.g., the path where session's PCAP files are located like /tmp/19

    	MergeFileList mergeFileList



    }

    

    type record TimeOffset