Add support of LibCommon v1.4.0 (6ffb66dd) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Interface.ttcn

+2 −10

Original line number	Diff line number	Diff line
		@@ -8,10 +8,8 @@
		module LibDiameter_Interface
		{
		//LibCommon
		import from LibCommon_Sync {type SyncPort;
		import from LibCommon_Sync {type SelfSyncComp;
		modulepar PX_TSYNC_TIME_LIMIT;};
		import from LibCommon_AbstractData {type StringStack;
		const c_initStringStack};
		import from LibCommon_BasicTypesAndValues {type UInt32;};

		//LibDiameter
		@@ -31,7 +29,7 @@ module LibDiameter_Interface
		type port DiameterPort message {
		inout DIAMETER_MSG}; //DIAMETER_MSG

		type component DiameterComponent
		type component DiameterComponent extends SelfSyncComp
		{
		//port
		port LowerLayerPPort LLPP;
		@@ -77,12 +75,6 @@ module LibDiameter_Interface
		var default vc_default_diameter;
		var default vc_def_catchSyncStop_diameter;

		// parts needed for Client/SelfSyncComp type compatibility
		var StringStack v_stateStack := c_initStringStack;
		port SyncPort syncSendPort;
		port SyncPort syncPort;
		timer tc_sync := PX_TSYNC_TIME_LIMIT;

		var boolean vc_isAF := false;
		var boolean vc_serverStop:=false;
		} // end DiameterComponent

ttcn/LibDiameter_Steps.ttcn

+6 −32

Original line number	Diff line number	Diff line
		@@ -7,8 +7,7 @@
		module LibDiameter_Steps
		{
		//LibCommon
		import from LibCommon_Sync {template m_syncClientStop,m_syncServerStop;
		function f_selfOrClientSyncAndVerdict;};
		import from LibCommon_Sync all;
		import from LibCommon_VerdictControl {type FncRetCode;
		function f_setVerdict;};
		import from LibCommon_BasicTypesAndValues {type UInt32;};
		@@ -1004,24 +1003,6 @@ group DefaultsTestStep

		}

		/**
		* @desc This default handles receiving of the sync server
		* STOP message and calls the RT HUT postamble. (copy from common lib)
		*/
		altstep a_diameter_catchSyncStop() runs on DiameterComponent
		{
		[] syncPort.receive(m_syncServerStop)
		{
		tc_sync.stop ;
		log("** a_diameter_catchSyncStop: Test component received STOP signal from MTC - going to IDLE state ** ");
		syncPort.send(m_syncClientStop);
		f_terminate_diameter_component();
		log("** a_diameter_catchSyncStop: TEST COMPONENT NOW STOPPING ITSELF! ** ") ;
		f_setVerdict(e_timeout);
		stop ;
		}
		}

		altstep a_diameter_default() runs on DiameterComponent
		{
		[] any timer.timeout
		@@ -1073,18 +1054,11 @@ group DefaultsTestStep
		stop;
		}
		}
		[] syncPort.receive(m_syncServerStop) {
		tc_sync.stop;
		vc_serverStop := true;
		log("* Test component received STOP signal from MTC *");
		if (vc_isAF) {
		f_postamble_AF();
		}
		else {
		f_postamble_PCRF();
		}
		log("* " & __SCOPE__ & ": INFO: TEST COMPONENT NOW STOPPING ITSELF! *");
		stop
		[] a_shutdown() {
		// Process temination on error
		log("* a_diameter_default() : Process temination on error *");
		// Terminate component execution
		stop;
		}
		}