Commit 92c42824 authored by urbant's avatar urbant
Browse files

Update to general configuration request

parent 649fe383

LibIot/LibIot_TypesAndValues.ttcn

+53 −34
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


module LibIot_TypesAndValues { 

	

	import from LibCommon_BasicTypesAndValues {type UInt32;}

	import from LibCommon_BasicTypesAndValues {type UInt32, UInt16;}



	import from LibCommon_VerdictControl {type FncRetCode;}
@@ -33,7 +33,7 @@ module LibIot_TypesAndValues { 
	 * 

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

	 */

	type integer PortNumber;

	type UInt16 PortNumber;

	

	/**

	 *
@@ -105,12 +105,21 @@ module LibIot_TypesAndValues { 
	  

	}

	

	group adpaterConfigurationTypes {



    type enumerated CaptureMode {

      e_live,

      e_offline,

      e_PCAPmerge



	group adapterConfigurationTypes {

		

    type union CaptureMode {

      LiveCapture liveCpature,

      OfflineCapture offlineCapture

    }

    

    //

    type record (1 .. infinity) of charstring PhysicalInterfaceList;

         

    type record LiveCapture {

    	PhysicalInterfaceList physicalInterfaces, // TODO document example syntax

      RecordMode            recordMode,

    }

    

    type enumerated RecordMode {
@@ -119,19 +128,28 @@ module LibIot_TypesAndValues { 
    }

    

    type record of charstring FileList;

    type record of charstring IfList;



    type record GeneralConfigurationReq // debug level?

    {

    type record MergeFileList {

      FileList    mergeFileList, 

      charstring  mergeFilePath   

    }

    

    type CaptureSource {

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

    	MergeFileList mergeFileList



    }

    

    type record OfflineCapture {

			UInt32         offset,

			CaptureSource  captureSource

    }

    

    

    type record GeneralConfigurationReq {

      charstring  captureProcessIpAddress,

      integer     captureProcessPort,

      CaptureMode captureMode,

      UInt32      pcapTimeStamp,

      RecordMode  recordMode,

      IfList      ifaces, // What is this? Ethernet card? One or mulitple? Documentation! Win only accepted?

      charstring  pcapFileName optional, // name and path; only in offline

      FileList    mergeFileList  optional, // only in offline

      charstring  mergeFilePath  optional  // only in offline

      PortNumber  captureProcessPort,

      CaptureMode captureMode

    }
@@ -175,6 +193,7 @@ module LibIot_TypesAndValues { 


	}



	group oracleRelatedTypes {

 	  // used for PIXIT definition

	  type enumerated IotVerdictType { e_e2e, e_conformance }
@@ -188,7 +207,7 @@ module LibIot_TypesAndValues { 
		  VerdictType e2e,

		  VerdictType conformance	

	  }

	

	}

	/**

     * @desc Default record

     */