......@@ -84,6 +84,36 @@ module AtsImsIot_Templates_MM {
modifies mw_TP_MM_ECSCF_INVITE_02 := {
}
template(present) INVITE_Request mw_TP_MM_ECSCF_NGC_INVITE_01 (
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PAssertedID p_pAssertedID := ?,
template (present) PPreferredID p_pPreferredID := ?,
template (present) Accept p_accept := ?,
template (present) RecvInfo p_recvInfo := ?
)
modifies mw_TP_MM_ECSCF_INVITE_02 := {
}
template(present) INFO_Request mw_TP_MM_ECSCF_NGC_INFO_01 (
template CallId p_callId := omit,
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PAssertedID p_pAssertedID := ?,
template (present) PPreferredID p_pPreferredID := ?,
template (present) Accept p_accept := ?,
template (present) RecvInfo p_recvInfo := ?
)
modifies mw_TP_MM_ECSCF_INFO_01 := {
}
template (present) Response mw_TP_MM_ECSCF_100Trying_01(
template (present) CSeq p_cSeq := ?,
template (present) From p_from := ?,
......@@ -212,5 +242,30 @@ module AtsImsIot_Templates_MM {
}
}
} // End of template mw_TP_MM_ECSCF_CANCEL_01
template(present) INFO_Request mw_TP_MM_ECSCF_INFO_01 (
template CallId p_callId := omit,
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PAssertedID p_pAssertedID := ?
)modifies mw_INFO_Dummy := {
requestLine := {
requestUri := p_invite_uri // @TODO
},
msgHeader := {
callId := p_callId,
contact := p_contact,
fromField := p_from,
pAssertedID := p_pAssertedID,
toField := p_to
},
messageBody := p_messageBody
}
} // End of module AtsImsIot_Templates_MM
......@@ -877,6 +877,45 @@ module AtsImsIot_Templates_MW {
) modifies mw_TP_MW_ECSCF_INVITE_01 := {
} // End of template mw_TP_MW_ECSCF_RE_INVITE_02
template(present) INVITE_Request mw_TP_MW_PCSCF_NGC_INVITE_01 (template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PPreferredID p_pPreferredID := ?,
template (present) Accept p_accept := ?,
template (present) RecvInfo p_recvInfo := ?
)
modifies mw_TP_MW_ECSCF_INVITE_02 := {
}
template(present) INFO_Request mw_TP_MW_PCSCF_NGC_INFO_01 (
template CallId p_callId := omit,
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PPreferredID p_pPreferredID := ?,
template (present) Accept p_accept := ?,
template (present) RecvInfo p_recvInfo := ?
)
modifies mw_INFO_Dummy := {
requestLine := {
requestUri := p_invite_uri // @TODO
},
msgHeader := {
accept := p_accept,
callId := p_callId,
contact := p_contact,
fromField := p_from,
pPreferredID := p_pPreferredID,
recvInfo := p_recvInfo,
toField := p_to
},
messageBody := p_messageBody
}
template (present) Response mw_TP_MW_ECSCF_100Trying_01(
template (present) CSeq p_cSeq := ?,
template (present) From p_from := ?,
......
......@@ -83,6 +83,30 @@ module AtsImsIot_Templates_MX {
)
modifies mw_TP_MX_ECSCF_INVITE_02 := {
}
template(present) INVITE_Request mw_TP_MX_PCSCF_NGC_INVITE_01 (template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PAssertedID p_pAssertedID := ?
)
modifies mw_TP_MX_ECSCF_INVITE_02 := {
}
template(present) INFO_Request mw_TP_MX_ECSCF_NGC_INFO_01 (
template CallId p_callId := omit,
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?,
template (present) Contact p_contact := ?,
template (present) MessageBody p_messageBody := ?,
template (present) PPreferredID p_pPreferredID := ?,
template (present) Accept p_accept := ?,
template (present) RecvInfo p_recvInfo := ?
)
modifies mw_TP_MX_ECSCF_INFO_01 := {
}
template (present) Response mw_TP_MX_ECSCF_100Trying_01(
template (present) CSeq p_cSeq := ?,
......@@ -147,6 +171,19 @@ module AtsImsIot_Templates_MX {
}
} // End of template mw_TP_MX_ECSCF_ACK_01
template(present) INFO_Request mw_TP_MX_ECSCF_INFO_01 (
template CallId p_callId := omit,
template (present) SipUrl p_invite_uri := ?,
template (present) From p_from := ?,
template (present) To p_to := ?
)modifies mw_INFO_Request_Base := {
msgHeader := {
fromField := p_from,
toField := p_to,
callId := p_callId
}
}
template (present) BYE_Request mw_TP_MX_ECSCF_BYE_01( // TODO To be enforced
template (present) CallId p_callId := ?,
template (present) CSeq p_cSeq := ?,
......
......@@ -50,6 +50,7 @@ module AtsImsIot_TestConfiguration {
const charstring c_userUE_A2 := "User A2";
//* eut trigger name User B
const charstring c_userUE_B := "User B";
const charstring c_userUE_B_emergency := "User B Emergency";
const charstring c_userUE_B2 := "User B2";
//* eut trigger name User C
const charstring c_userUE_C := "User C";
......
......@@ -64,6 +64,8 @@ module AtsImsIot_TestSystem {
group portDefinitions {
type port ImsCoordinationPort message {
inout SipMessage, DIAMETER_MSG;
} with {
extension "internal"
}
type port DataPort message {
in Request, Response, SEND_request, RECEIVE_response; // SIP
......@@ -134,7 +136,7 @@ module AtsImsIot_TestSystem {
SipInterfaceMonitor mwIE optional,// Mw interface at I-CSCF/S-CSCF to E-CSCF
SipInterfaceMonitor mwPB optional,// Mw interface at P-CSCF/IBCF
SipInterfaceMonitor mwIB optional,// Mw interface at I-CSCF/IBCF
SipInterfaceMonitor isc optional,
SipInterfaceMonitor isc optional,// ISC interface at AS to S-CSCF
DiameterInterfaceMonitor cxIH optional,
DiameterInterfaceMonitor cxSH optional,
DiameterInterfaceMonitor gx optional,
......
suite := AtsImsIot
sources := \
AtsImsIot_TypesAndValues.ttcn \
AtsImsIot_Diameter_Templates.ttcn \
AtsImsIot_Templates.ttcn \
AtsImsIot_Templates_GM.ttcn \
AtsImsIot_Templates_IC.ttcn \
AtsImsIot_Templates_MW.ttcn \
AtsImsIot_Templates_MI.ttcn \
AtsImsIot_Templates_MM.ttcn \
AtsImsIot_Templates_MX.ttcn \
AtsImsIot_Templates_ML.ttcn \
AtsImsIot_Templates_ISC.ttcn \
AtsImsIot_TestConfiguration.ttcn \
AtsImsIot_TP_behavior_CX.ttcn \
AtsImsIot_TP_behavior_ISC.ttcn \
AtsImsIot_TP_behavior_SH.ttcn \
AtsImsIot_TP_behavior_GM.ttcn \
AtsImsIot_TP_behavior_MW_IS.ttcn \
AtsImsIot_TP_behavior_RX.ttcn \
AtsImsIot_TP_behavior_GX.ttcn \
AtsImsIot_TP_behavior_MW_PS.ttcn \
AtsImsIot_TP_behavior_MM.ttcn \
AtsImsIot_TP_behavior_ML.ttcn \
AtsImsIot_TP_behavior_MI.ttcn \
AtsImsIot_TP_behavior_MX.ttcn \
AtsImsIot_TP_behavior_S6A.ttcn \
AtsImsIot_TD_ATT.ttcn \
AtsImsIot_TD_REG.ttcn \
AtsImsIot_Functions.ttcn \
AtsImsIot_Emergency.ttcn \
AtsImsIot_TD_DRG.ttcn \
AtsImsIot_TD_DTC.ttcn \
AtsImsIot_TestControl.ttcn \
AtsImsIot_PIXITS.ttcn \
AtsImsIot_TD_INI.ttcn \
../patch_ats_ims_iot/ttcn/AtsImsIot_TestSystem.ttcn \
AtsImsIot_TP_behavior_IC.ttcn \
AtsImsIot_TP_behavior_MW_SI.ttcn \
AtsImsIot_TP_behavior_S9.ttcn \
modules := ../LibCommon \
../LibIms \
../LibIot \
../LibMsrp \
../LibUpperTester \
../LibIms_ConfigAndTrigger \
../LibSip \
../LibDiameter \
../../titan-test-system-framework/ttcn/LibHelpers \
../../titan-test-system-framework/ccsrc/Framework \
../../titan-test-system-framework/ccsrc/Helpers \
../../titan-test-system-framework/ccsrc/loggers \
../../titan-test-system-framework/ccsrc/Protocols/ETH \
../../titan-test-system-framework/ccsrc/Protocols/Tcp \
../../titan-test-system-framework/ccsrc/Protocols/UDP \
../../titan-test-system-framework/ccsrc/Protocols/Xml \
../../ccsrc/Ports/LibSip \
../../ccsrc/Ports/ImsMonitorSipPort \
../../ccsrc/Ports/LibDiameter \
../../ccsrc/Ports/ImsMonitorDiameterPort \
../../ccsrc/Ports/Naptr \
../../ccsrc/Ports/Data \
../../ccsrc/Ports/Sgi \
../../ccsrc/Ports/LibIot \
../../ccsrc/EncDec/LibDiameter \
../../ccsrc/EncDec/LibSip \
../../ccsrc/EncDec/LibMsrp \
../../ccsrc/Protocols/Diameter \
../../ccsrc/Protocols/LowerLayerPPort \
../../ccsrc/Protocols/Sip \
../../ccsrc/Protocols/Naptr \
../../ccsrc/Protocols/UpperTester \
../modules/titan.TestPorts.Common_Components.Abstract_Socket \
......@@ -6,14 +6,9 @@
module LibIms_UpperTester {
import from LibIot_Functions {function f_sendEquipmentCmd;}
import from LibUpperTester {
template m_EQ_Request;
type EquipmentCommand;
}
import from LibIot_TestInterface {type TestCoordinator, EquipmentUser;}
import from LibIot_Functions all;
import from LibUpperTester all;
import from LibIot_TestInterface all;
group ue {
group ueTypes {
......
sources := LibIms_UpperTester.ttcn
\ No newline at end of file
......@@ -5,7 +5,7 @@
*/
module LibIot_Functions {
import from LibCommon_VerdictControl {type FncRetCode;}
import from LibCommon_VerdictControl all;
import from LibUpperTester {
template mw_EO_Response;
......
......@@ -269,6 +269,12 @@ module LibIot_PIXITS {
*/
modulepar integer PX_EUT_B := 2;
/**
*
* @desc Selects product based on index in PX_PRODCUTS vendor list for EUT_B
*/
modulepar integer PX_EUT_B_EMERGENCY := 3;
/**
*
* @desc Selects product based on index in PX_PRODCUTS vendor list for EUT_C
......@@ -353,7 +359,7 @@ module LibIot_PIXITS {
* @desc
* Defines the location of the files to merge.
*/
modulepar charstring PX_IOT_MERGE_TOOL_PATH := "C:\Program Files\WireShark";
modulepar charstring PX_IOT_MERGE_TOOL_PATH := "C:\\Program Files\\WireShark";
/**
* @desc
......@@ -370,7 +376,7 @@ module LibIot_PIXITS {
* List of the network interfaces to monitor.
* Use ';' to separate the interfaces
*/
modulepar charstring PX_IOT_IFACES := "rpcap://\Device\NPF_{60DAA80A-2AC6-4592-B3A7-80FC0FF08908}";
modulepar charstring PX_IOT_IFACES := "rpcap://\\Device\\NPF_{60DAA80A-2AC6-4592-B3A7-80FC0FF08908}";
modulepar EutInterfaceInfoList PX_IOT_EUTs_IFACE_INFO_LIST :=
{
......
......@@ -13,7 +13,7 @@ module LibIot_TestInterface {
import from LibIot_TypesAndValues all;
import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}
import from LibIot_PIXITS all;
import from LibCommon_Sync all;
import from LibSip_SIPTypesAndValues all;
......@@ -101,6 +101,8 @@ module LibIot_TestInterface {
}
type port VerdictPort message {
inout IotVerdict;
} with {
extension "internal"
}
type port AdapterConfigPort message {
......
......@@ -9,7 +9,7 @@ module LibIot_TypesAndValues {
import from LibCommon_BasicTypesAndValues {type UInt32, UInt16;}
import from LibCommon_VerdictControl {type FncRetCode;}
import from LibCommon_VerdictControl all;
group commonTypes {
type enumerated IOTExecMode { e_realtime, e_offline }
......
......@@ -5,32 +5,10 @@
* changeable within validation
*/
module LibIot_VxLTE_Functions {
module LibIot_VxLTE_Functions {
import from LibIot_TypesAndValues {
type
IOTExecMode,
IotVerdictType,
CaptureMode,
RecordMode,
FileList,
TimeOffset,
EutInterfaceInfoList,
ProtocolFilter,
IpAddress,
PortNumber,
ProductList,
InterfaceAvailable,
InterfaceAvailableList,
MonitorInterfaceInfo,
VxLTEMonitorInterfaceList;
}
import from AtsImsIot_Templates {
template /*m_generalConfigurationReq_offline, m_generalConfigurationReq_online, m_generalConfigurationReq_merge,
m_generalConfigurationRsp_success, m_generalConfigurationRsp_error, m_generalConfigurationRsp_timeout,*/
m_SetFilterReq /*, mw_SetFilterRsp, m_startTrafficCaptureReq, m_stopTrafficCaptureReq,
m_startTrafficCaptureRsp_any, m_stopTrafficCaptureRsp_any*/;
}
import from LibIot_TypesAndValues all;
import from AtsImsIot_Templates all;
import from LibIot_VxLTE_PIXITS all;
import from LibIot_VxLTE_Templates all;
......
......@@ -7,11 +7,7 @@
module LibIot_VxLTE_PIXITS {
import from LibIot_TypesAndValues
{
type IOTExecMode, IotVerdictType, CaptureMode, RecordMode, FileList, TimeOffset, EutInterfaceInfoList,
ProtocolFilter, IpAddress, PortNumber, ProductList, InterfaceAvailableList,MonitorInterfaceInfo;
}
import from LibIot_TypesAndValues all;
group VxLTEMonitorInterfaces_PIXITS{
......@@ -54,6 +50,7 @@ module LibIot_VxLTE_PIXITS {
group Mw{
modulepar charstring PX_SIP_MM_B_PSAP_INTERFACENAME := "Mm IBCF PSAP"; //Mm interface between IBCF and PSAP
modulepar charstring PX_SIP_MW_EB_INTERFACENAME := "Mw ECSCF IBCF"; //Mw interface between ECSCF and IBCF
modulepar charstring PX_SIP_MI_EB_INTERFACENAME := "Mi ECSCF BCF"; //Mw interface between ECSCF and BGCF
modulepar charstring PX_SIP_ML_E_LRF_INTERFACENAME := "Ml ECSCF LRF"; //Ml interface between ECSCF and LRF
modulepar charstring PX_SIP_MW_S_PSAP_INTERFACENAME := "Mw SCSCF PSAP"; //Mw interface between S-CSCF and PSAP
modulepar charstring PX_SIP_MW_PI_INTERFACENAME := "Mw PI"; //Mw interface between P-CSCF and I-CSCF
......
sources := \
LibIot_Functions.ttcn \
LibIot_TestConfiguration.ttcn \
LibIot_TypesAndValues.ttcn \
LibIot_VxLTE_PIXITS.ttcn \
LibIot_PIXITS.ttcn \
LibIot_TestInterface.ttcn \
LibIot_VxLTE_Functions.ttcn \
LibIot_VxLTE_Templates.ttcn \
......@@ -6,15 +6,13 @@
module LibMsrp_Functions {
// LibMsrp
import from LibMsrp_TypesAndValues {
type
MsrpURI
};
import from LibMsrp_TypesAndValues all;
function f_str2msrpUri(in charstring p_uri, out template MsrpURI p_msrpUri)
function f_str2msrpUri(in charstring p_uri, out MsrpURI p_msrpUri)
return boolean {
var integer v_res := 0;
v_res := decvalue(oct2bit(char2oct(p_uri)), p_msrpUri);
var bitstring v_oct2bit := oct2bit(char2oct(p_uri));
v_res := decvalue(v_oct2bit, p_msrpUri);
return v_res == 0;
} // End of function f_str2msrpUri
......
......@@ -422,19 +422,19 @@ module LibMsrp_Templates {
toPath := m_msrpToPath_Dummy,
fromPath := m_msrpFromPath_Dummy,
headers := {
authenticationInfo := omit,
authorization := omit,
messageID := m_msrpMessageID_Dummy,
successReport := omit,
failureReport := omit,
byteRange := m_msrpByteRange_Dummy,
status := omit,
expires := omit,
extHeaders := omit,
failureReport := omit,
maxExpires := omit,
messageID := m_msrpMessageID_Dummy,
minExpires := omit,
status := omit,
successReport := omit,
maxExpires := omit,
usePath := omit,
wwwAuthenticate := omit
wwwAuthenticate := omit,
authorization := omit,
authenticationInfo := omit,
extHeaders := omit
}
}, // End of 'headers' field
contentStuff := m_msrpContentStuff_Dummy,
......@@ -539,19 +539,19 @@ module LibMsrp_Templates {
toPath := m_msrpToPath_Dummy,
fromPath := m_msrpFromPath_Dummy,
headers := {
authenticationInfo := omit,
authorization := omit,
messageID := m_msrpMessageID_Dummy,
successReport := omit,
failureReport := omit,
byteRange := omit,
status := omit,
expires := omit,
extHeaders := omit,
failureReport := omit,
maxExpires := omit,
messageID := m_msrpMessageID_Dummy,
minExpires := omit,
status := omit,
successReport := omit,
maxExpires := omit,
usePath := omit,
wwwAuthenticate := omit
wwwAuthenticate := omit,
authorization := omit,
authenticationInfo := omit,
extHeaders := omit
}
}, // End of 'headers' field
endLine := {
......@@ -587,15 +587,7 @@ module LibMsrp_Templates {
) modifies mw_msrpResponse_toPath_fromPath := {
headers := {
headers := {
authenticationInfo := *,
authorization := *,
byteRange := *,
expires := *,
extHeaders := *,
maxExpires := *,
messageID := *,
minExpires := *,
status := *,
successReport := {
headerName := SUCCESS_REPORT_E,
reportStatus := e_YES
......@@ -604,8 +596,16 @@ module LibMsrp_Templates {
headerName := FAILURE_REPORT_E,
reportStatus := e_NO
},
byteRange := *,
status := *,
expires := *,
minExpires := *,
maxExpires := *,
usePath := *,
wwwAuthenticate := *
wwwAuthenticate := *,
authorization := *,
authenticationInfo := *,
extHeaders := *
} // End of 'header' field
} // End of 'headers' field
} // // End of template mw_msrpResponse_toPath_fromPath_with_transferReports
......
sources := \
LibMsrp_Functions.ttcn \
LibMsrp_PIXITS.ttcn \
LibMsrp_Templates.ttcn \
LibMsrp_TypesAndValues.ttcn \
../patch_lib_msrp_titan/ttcn/LibMsrp_EncDecDeclarations.ttcn \
Subproject commit a227e9fca956475c5b481fb6042ecfcc9d632502
Subproject commit 44122c6589a3fa7f42825d2475511d08da499ff0
......@@ -4,7 +4,7 @@
* @desc xxx
*/
module LibUpperTester {
import from LibCommon_VerdictControl {type FncRetCode;}
import from LibCommon_VerdictControl all;
import from LibIot_TypesAndValues {type Status;}
// TODO - move to common lib
......