Commit 0772f126 authored by Naum Spaseski's avatar Naum Spaseski

STF531: Corrections for test CSE/REG/CRE/008

Signed-off-by: 's avatarNaum Spaseski <naum.spaseski@gmail.com>
parent a90b1061
......@@ -1361,7 +1361,7 @@ module OneM2M_Functions {
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on InCseSimu return integer {
function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on InCseSimu return integer {
var MsgIn v_request;
var ResponsePrimitive v_response;
......@@ -1370,15 +1370,11 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mccPort.receive(mw_request(?)) -> value v_request {
[] mccPort.receive(mw_request(p_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
v_resourceIndex := f_cse_createLocalResource(v_request.primitive.requestPrimitive.primitiveContent, 1, int16, v_remoteCSEResource);//TODO Get index from v_request.primitive.requestPrimitive.to_
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type RemoteCSE");
}
[] mccPort.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
......
......@@ -588,6 +588,14 @@ module OneM2M_Templates {
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
/**
* @desc CREATE request primitive for remoteCSE resource
*/
template RequestPrimitive mw_createRemoteCSEBase() modifies mw_create := {
resourceType := int16,
primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
/**
* @desc CREATE request primitive for Container resource wiht no resourceName provided
*/
......
......@@ -1035,7 +1035,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer request to the IN-CSE
*
*/
testcase TC_CSE_REG_CRE_008() runs on CseSimu system CseSystem {
testcase TC_CSE_REG_CRE_008() runs on InCseSimu system CseSystem {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
......@@ -1045,7 +1045,7 @@ module OneM2M_Testcases {
f_cf02UpCseSimuMaster();
//Preambule
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Test Body
vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM")));
......
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