Commit 36da4233 authored by garciay's avatar garciay
Browse files

Add Request/Response processing into default altstep clause

parent 314d7bfa
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -1140,8 +1140,18 @@ module AtsImsIot_Functions {
	group altsteps {
		
		altstep a_default(in charstring p_TP) runs on ImsInterfaceMonitor {
			[] dPort.receive(Request:?) {
				log(self, "### a_default: Request default for " & p_TP );
				repeat; 
			}
			[] dPort.receive(Response:?) {
				log(self, "### a_default: Response default for " & p_TP );
				repeat; 
			}
			[] dPort.receive {
				log(self, "*** a_default: Received/ignored unexpected message when waiting for message complying to " & p_TP );
            	//setverdict(fail, self, "### YANN: If execution is here, this means that the message was not properly decoded due to sip/sdp-codets exception, check MMagic logs");    
				//stop; // YANN: If execution is here, this means that the message was not properly decoded 
				repeat; 
			}
		}
@@ -1273,6 +1283,10 @@ module AtsImsIot_Functions {
          in boolean p_checkMessage
        ) runs on ImsInterfaceMonitor { 

//log ("### f_imsIot_receive: ", p_passCriteria);
//log ("### f_imsIot_receive: ", p_failCriteria);


            var integer v_size := lengthof(p_failCriteria); 
            var DefaultList v_defaultArray;
			var integer i := 0;
@@ -1358,16 +1372,19 @@ module AtsImsIot_Functions {

			for (var integer i := 0; i < v_size; i := i + 1) {
				if (ischosen(p_list[i].request)) {
log ("### f_activateImsSipDefaults: activate ", p_list[i].request);
					p_default[v_idx] := activate(
						a_receive_sipRequest(p_list[i].request,p_verdict, p_tpId, p_forwardMtc, p_checkMessage)
					);
				} else {
log ("### f_activateImsSipDefaults: activate ", p_list[i].response);
					p_default[v_idx] := activate(
						a_receive_sipResponse(p_list[i].response,p_verdict, p_tpId, p_forwardMtc, p_checkMessage)
					);
				}
				v_idx := v_idx + 1;
			}
//log ("### f_activateImsSipDefaults: ended");
		}
        
	}//end group