Commit 5156b014 authored by garciay's avatar garciay
Browse files

Validation of ATSP

parent 5d495689
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ module LibItsAtsp_Functions {
				var template CfAtspEventInd v_cfAtspEventInd;
			
				v_cfAtspEventInd := mw_cfAtspRequestRequest(p_expectedMI_Request);
    	        log("*** f_cnAwaitAndConfirmMI_RequestCI: INFO: Expected MI-REQUEST.request: ", v_cfAtspEventInd, " ***");
    	        log("*** f_cnAwaitAndConfirmMI_RequestCI: DEBUG: Expected MI-REQUEST.request: ", v_cfAtspEventInd, " ***");
        	    tc_wait.start;
            	alt {
                	[] cfPort.receive(v_cfAtspEventInd) -> value v_result {
@@ -514,7 +514,7 @@ module LibItsAtsp_Functions {
                        	log("*** f_cnAwaitAndConfirmMI_RequestCI: ERROR: An unexpected MI-REQUEST.Request was received ***", v_result);
	                        f_selfOrClientSyncAndVerdict("error", e_timeout); // to be checked
    	                } else { 
        	                log("*** f_cnAwaitAndConfirmMI_RequestCI: INFO: An unexpected MI-REQUEST.Request was received, repeating check ***");
        	                log("*** f_cnAwaitAndConfirmMI_RequestCI: DEBUG: An unexpected MI-REQUEST.Request was received, repeating check ***");
							f_cnConfirmMI_RequestCI(m_cfAtspRequestConfirm(v_result.miRequestRequest, c_ciErrStatusSuccess));
                	        repeat;
                    	} 
@@ -551,7 +551,7 @@ module LibItsAtsp_Functions {
				var template CfAtspEvent v_cfConfirmEvent;
			
				v_cfConfirmEvent := m_cfAtspMIRequest_confirm(p_MI_RequestConfirm);
				log("*** f_cnConfirmMI_RequestCI: INFO: Sending MI-REQUEST.confirm: ", v_cfConfirmEvent, " ***");
				log("*** f_cnConfirmMI_RequestCI: DEBUG: Sending MI-REQUEST.confirm: ", v_cfConfirmEvent, " ***");
				cfPort.send(v_cfConfirmEvent);
	        } // End of function f_cnConfirmMI_RequestCI
	
@@ -565,7 +565,7 @@ module LibItsAtsp_Functions {
				var template CfAtspEvent v_cfCommandEvent;
				
				v_cfCommandEvent := m_cfAtspCommandReqEvent(p_sentMI_Command);
				log("*** f_cnSendMICOMMAND_RequestCI: INFO: Sending MI-COMMAND.request: ", v_cfCommandEvent, " ***");
				log("*** f_cnSendMICOMMAND_RequestCI: DEBUG: Sending MI-COMMAND.request: ", v_cfCommandEvent, " ***");
				cfPort.send(v_cfCommandEvent);
			} // End of function f_cnSendMICOMMAND_RequestCI
	
@@ -622,7 +622,7 @@ module LibItsAtsp_Functions {
									?,
									?));
				
	            log("*** f_cnAwaitCommandConfirm: INFO: Expected MI-COMMAND.confirm: ", v_cfAtspEventInd, " ***");
	            log("*** f_cnAwaitCommandConfirm: DEBUG: Expected MI-COMMAND.confirm: ", v_cfAtspEventInd, " ***");
    	        tc_wait.start;
        	    alt {
            	    [] cfPort.receive(v_cfAtspEventInd) -> value v_result {
@@ -637,10 +637,10 @@ module LibItsAtsp_Functions {
					[] cfPort.receive( v_cfAtspEventReq ) -> value v_result {
	                    if (p_discard == false) { 
                    	    tc_wait.stop;
                        	log("*** f_cnAwaitAndConfirmMI_RequestCI: ERROR: An unexpected MI-REQUEST.Request was received ***", v_result);
                        	log("*** f_cnAwaitCommandConfirm: ERROR: An unexpected MI-COMMAND.confirm was received ***", v_result);
	                        f_selfOrClientSyncAndVerdict("error", e_timeout); // to be checked
    	                } else { 
        	                log("*** f_cnAwaitAndConfirmMI_RequestCI: INFO: An unexpected MI-REQUEST.Request was received, repeating check ***");
        	                log("*** f_cnAwaitCommandConfirm: INFO: An unexpected MI-COMMAND.confirm was received, repeating check ***");
							f_cnConfirmMI_RequestCI(m_cfAtspRequestConfirm(v_result.miRequestRequest, c_ciErrStatusSuccess));
                	        repeat;
                    	}
@@ -1399,6 +1399,7 @@ module LibItsAtsp_Functions {
									'FFFE'O &
									int2oct(p_medID,1) &
									int2oct(p_vCIserialNumber,2);
				log("f_get_EUI64_LegacyCI: DEBUG: returns ", v_returnValue, " ***");
				return v_returnValue;
		} // End of function f_get_EUI64_LegacyCI
		
+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ module LibItsAtsp_Pics {
         * @desc Is IUT supporting dynamic registration using the standardized registration procedure?
         * @see  ETSI TS 102 760-1 v_stf455_v06 C.1/1
         */
        modulepar boolean PICS_DYNREG := false;
        modulepar boolean PICS_DYNREG := true;

        /**
         * @desc Is IUT supporting the inactivation procedure?