Commit 5707fcfa authored by YannGarcia's avatar YannGarcia
Browse files

Review Initial conditions for all Test Cases

parent 549be05d
This diff is collapsed.
......@@ -195,8 +195,13 @@ module LibNg112_Pics {
modulepar boolean PICS_B_SDP_ULA1 := true;
/**
* @desc Does IUT support SIP OPTION?
* @desc Does IUT support SIP OPTIONS?
*/
modulepar boolean PICS_S_SIP_OPT1 := true;
/**
* @desc Does IUT busy?
*/
modulepar boolean PICS_S_SIP_BUS1 := true;
} // End of module LibNg112_Pics
......@@ -170,9 +170,9 @@ module LibNg112_Pixits {
modulepar XSD.Double PX_CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS := 2.0;
modulepar XSD.DateTime PX_LOST_EXPIRES := "";
modulepar XSD.DateTime PX_LOST_EXPIRES := "1970-01-01T00:00:00+00:00";
modulepar XSD.DateTime PX_LOST_LAST_UPDATED := "";
modulepar XSD.DateTime PX_LOST_LAST_UPDATED := "1970-01-01T00:00:00+00:00";
modulepar XSD.AnyURI PX_E_UNKNOWN_SERVICE_URN := "urn:service:sos.unknown";
......
......@@ -167,6 +167,28 @@ module LibNg112_Templates {
messageBody := p_mb
} // End of template m_MESSAGE_Request_IMS_Ng112
template(present) MESSAGE_Request mw_MESSAGE_Request_IMS_Ng112(
template(present) SipUrl p_requestUri := ?,
template(present) CallId p_callId := ?,
template(present) CSeq p_cSeq := ?,
template(present) From p_from := ?,
template(present) To p_to := ?,
template(present) Via p_via := ?,
template Require p_require := *,
template Route p_route := *,
template Supported p_supported := *,
template(present) MessageBody p_mb := ?
) modifies mw_MESSAGE_Request_Base := {
msgHeader := {
contentType := m_contentType(c_plainText),
pAccessNetworkInfo := m_pAccessNetworkInfo_IEEE_11a,
require := p_require,
route := p_route,
supported := p_supported
},
messageBody := p_mb
} // End of template mw_MESSAGE_Request_IMS_Ng112
} // End of group ng112_message
group routes {
......
......@@ -298,6 +298,31 @@ module LibIms_Steps {
vc_contact := m_Contact(m_SipUrl_currIpaddr_CSCF(vc_userprofile));
} // end f_setHeadersNOTIFY
/**
* @desc Sets Options header fields (IMS addresses) extension of general settings from LibSip basic function
* @param p_cSeq_s The current cSeq
* @param p_to_user The selected user's SIP URL
*/
function f_setHeadersOPTIONS(
inout CSeq p_cSeq_s,
in SipUrl p_to_user,
in SipUrl p_from_user
) runs on ImsComponent {
LibSip_Steps.f_setHeadersOPTIONS(p_cSeq_s);
vc_branch := c_branchCookie & f_getRndTag();
vc_via := {
fieldName := VIA_E,
viaBody := {valueof(m_ViaBody_virtual_XCSCF(vc_branch, vc_userprofile))}
};
vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier
vc_from := f_initFromHeader(p_from_user, f_getRndTag()); // init of vc_from using userProfile identifier
vc_requestUri := p_to_user; // Request URI of Invite is identical with To header
// contact header initialization for sending of OPTIONS from CSCF component
vc_contact := m_Contact(m_SipUrl_currIpaddr_CSCF(vc_userprofile));
} // end f_setHeadersOPTIONS
/**
* @desc Sets Publish header fields (IMS addresses) extension of general settings from LibSip basic function
* @param p_cSeq_s The current cSeq
......@@ -1352,7 +1377,7 @@ module LibIms_Steps {
[] SIPP.receive(mw_Response_Base(c_statusLine100, ?, ?)) {
repeat;
}
// ignore 181 if flag is set (following TS 183004 §4.5.2.1)
// ignore 181 if flag is set (following TS 183004 ����4.5.2.1)
[vc_ignore181] SIPP.receive(mw_Response_Base(c_statusLine181, vc_callId, vc_cSeq)) -> value v_response sender vc_sent_label {
v_cSeq := valueof(v_response.msgHeader.cSeq);
f_setHeadersOnReceiptOfResponse(v_response);
......
/**
* @author ETSI / STF545
* @version $URL$
* $ID:$
* @desc This module provides the test system used by ITS HTTP based protocols.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
* @see ETSI TS 103 478
*/
module LibItsHttp_TestSystem {
// LibCommon
import from LibCommon_Sync all;
import from LibCommon_Time all;
// LibItsHttp
import from LibItsHttp_TypesAndValues all;
type port HttpPort message {
inout HttpMessage;
}
type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest
port HttpPort httpPort;
timer tc_ac := PX_TAC;
timer tc_noac := PX_TNOAC;
} // End of component HttpComponent
type component HttpTestAdapter { // FIXME To be rename into HttpTestSystem
port HttpPort httpPort;
} // End of component TestAdapter
} // End of module LibItsHttp_TestSystem
......@@ -1652,6 +1652,21 @@ module LibSip_Steps {
vc_reqHostPort := vc_requestUri.components.sip.hostPort;
} // end function f_setHeadersNOTIFY
/**
* @desc setting of general and basic Notify header fields in additon to the addresses (To, From, ReqUri)
* @param p_cSeq_s
*/
function f_setHeadersOPTIONS(
inout CSeq p_cSeq_s
) runs on SipComponent {
f_setHeadersGeneral(p_cSeq_s, "OPTIONS"); // cseq, contact, branch, via
vc_cancel_To := vc_to;
vc_caller_To := vc_to;
vc_caller_From := vc_from;
vc_reqHostPort := vc_requestUri.components.sip.hostPort;
} // end function f_setHeadersOPTIONS
/**
* @desc setting of general and basic Publish header fields in additon to the addresses (To, From, ReqUri)
* @param p_cSeq_s
......@@ -3899,6 +3914,16 @@ module LibSip_Steps {
SIPP.send(p_request) to vc_sent_label;
}
/**
* @desc function send OPTIONS message
* @param p_request template of the notify to be sent
*/
function f_SendOPTIONS(
template(value) OPTIONS_Request p_request
) runs on SipComponent {
SIPP.send(p_request) to vc_sent_label;
}
/**
* @desc send REFER message
* @param p_request template of the message to be sent
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment