Skip to content
Snippets Groups Projects
Commit c4e2da8e authored by garciay's avatar garciay
Browse files

Align TTCN-3 code on draft ETSI TS 102 985-2 v0.0.8

parent af87d38c
No related branches found
No related tags found
No related merge requests found
......@@ -18,28 +18,35 @@ module LibItsMgt_Functions {
import from LibCommon_VerdictControl all;
// LibIts
import from CALMllsap language "ASN.1:1997" {
type
MedType, CIaClass, CIclass
};
import from CALMmanagement language "ASN.1:1997" {
type
ITS_scuId
};
import from CALMiitsscu language "ASN.1:1997" {
type PduCounter
type
IIC_Request,
ITS_SCUtype,
PduCounter
};
import from CALMmsap language "ASN.1:1997" {
type
CommandRef, MN_Request_request, FWTupdate
CommandRef,
MN_Request_request, FWTupdate,
MF_Request_request
};
import from CALMfsap language "ASN.1:1997" {
type
GCregServer, GCregClient, GCderegClient, GCctxTxCmd, CTXrxNot
};
import from LibItsMgt_TypesAndValues {
type MacAddressType
};
import from LibItsMgt_Templates all;
import from LibItsMgt_Pixits all;
import from LibIts_Interface {
type
IiscReq, IiscResp,
ItsMgt,
MgtMNSapCommandReqInd
};
......@@ -183,6 +190,25 @@ module LibItsMgt_Functions {
} // end of group mnSap
group functions {
/**
* @desc Triggers a request command event in the test system adaptation.
* @param p_requestRequest The remote commad to trigger
* @return FncRetCode
*/
function f_mgtMFTriggerRequest(
in template (value) MF_Request_request p_requestRequest
) runs on ItsMgt return FncRetCode {
var FncRetCode v_ret := e_success;
mgtMFSapPort.send(m_mgtMFSapRequestReq(p_requestRequest));
return v_ret;
}
} // End of group functions
group mgtAltsteps {
group mfSap {
......@@ -196,6 +222,11 @@ module LibItsMgt_Functions {
log("*** a_mgtMFSapPortDefault: INFO: MF-SAP service primitive received in default ***");
repeat;
}
[] mgtMFSapPort.receive(mw_mgtMFSapRequestReq(mw_mfRequestRequest_any)) { // Receive any MF-COMMAND.request message
log("*** a_mgtMFSapPortDefault: INFO: MF-SAP service primitive received in default ***");
repeat;
}
// FIXME Add support of response to CommandRequest & RequestRequest
// [] mgtMFSapPort.receive(mw_mgtMFSapCommandInd(mw_mfCommandRequest_any)) { // Receive any MF-COMMAND.request message
// log("*** a_mgtMFSapPortDefault: INFO: MF-SAP service primitive received in default ***");
// repeat;
......@@ -319,6 +350,27 @@ module LibItsMgt_Functions {
} // End of group mgtAltsteps
group iiscFunctions {
/**
* @desc Triggers a request command event in the test system adaptation.
* @param p_rCmd The remote commad to trigger
* @return FncRetCode
*/
function f_iiscTriggerRequest(
in template (value) IIC_Request p_rCmd
) runs on ItsMgt return FncRetCode {
var FncRetCode v_ret := e_success;
iiscPort.send(m_iiscReq(p_rCmd));
return v_ret;
}
} // End of group iiscFunctions
group iiscAltsteps {
// /**
......@@ -490,14 +542,66 @@ module LibItsMgt_Functions {
group iutFunctions {
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_SRC_ITS_SCU_ID
*/
function f_getIutSourceITS_scuId() return ITS_scuId {
return PX_SRC_ITS_SCU_ID;
}
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_DST_ITS_SCU_ID
*/
function f_getIutDestITS_scuId() return ITS_scuId {
return PX_DST_ITS_SCU_ID;
}
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_SRC_ITS_SCU_TYPE
*/
function f_getIutSourceITS_scuType() return ITS_SCUtype {
return PX_SRC_ITS_SCU_TYPE;
}
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_MED_TYPE
*/
function f_getIutMedType() return MedType {
return PX_MED_TYPE;
}
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_CIACLASS
*/
function f_getIutCIaClass() return CIaClass {
return PX_CIACLASS;
}
/**
* @desc TODO
* @return TODO
* @verdict Unchanged
* @see PX_CICLASS
*/
function f_getIutCIClass() return CIclass {
return PX_CICLASS;
}
} // End of group iutFunctions
} // End of module LibItsMgt_Functions
\ No newline at end of file
......@@ -12,6 +12,13 @@ module LibItsMgt_Pixits {
};
// LibIts
import from CALMiitsscu language "ASN.1:1997" {
type ITS_SCUtype
};
import from CALMllsap language "ASN.1:1997" {
type
MedType, CIaClass, CIclass
};
import from CALMfntp language "ASN.1:1997" {
type PortNumber
};
......@@ -24,6 +31,11 @@ module LibItsMgt_Pixits {
*/
modulepar ITS_scuId PX_SRC_ITS_SCU_ID := 0;
/**
* @desc ITS_SCUtype of the source ITS-SCU which produces the request
*/
modulepar ITS_SCUtype PX_SRC_ITS_SCU_TYPE := 2; // router
/**
* @desc ITS-SCU-ID of the destination ITS-SCU which shall evaluate the request
*/
......@@ -45,4 +57,10 @@ module LibItsMgt_Pixits {
*/
modulepar Bit4 PX_PDU_REQUEST_FILL_FIELD_VALUE := '0000'B;
modulepar MedType PX_MED_TYPE := 0; // MedType_unknown_
modulepar CIaClass PX_CIACLASS := 0; // CIaClass_unknown_
modulepar CIclass PX_CICLASS := 0; // CIclass_unknown_
} // End of module LibItsMgt_Pixits
This diff is collapsed.
......@@ -14,13 +14,13 @@ module LibItsMgt_TypesAndValues {
* <li>Broadcast MAC address on unknown VCI</li>
* <li>Unicast MAC address on unknown VCI</li>
*/
type enumerated MacAddressType {
e_broadcast (0),
e_multicast (1),
e_unicast (2),
e_broadcast_on_otherVCI (3),
e_unicast_on_otherVCI (4)
} // End of type MacAddressType
// type enumerated MacAddressType { // FIXME Check if it is used somewhere :-)
// e_broadcast (0),
// e_multicast (1),
// e_unicast (2),
// e_broadcast_on_otherVCI (3),
// e_unicast_on_otherVCI (4)
// } // End of type MacAddressType
}
with {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment