Commit 299d9baf authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/Release1'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 82959418 2c5f66f0
...@@ -184,7 +184,7 @@ module OneM2M_PermutationFunctions { ...@@ -184,7 +184,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start; tc_ac.start;
alt { alt {
[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) { [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container update request received successfuly"); setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
...@@ -275,7 +275,7 @@ module OneM2M_PermutationFunctions { ...@@ -275,7 +275,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start; tc_ac.start;
alt { alt {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) { [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly"); setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive); f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
...@@ -510,7 +510,7 @@ module OneM2M_PermutationFunctions { ...@@ -510,7 +510,7 @@ module OneM2M_PermutationFunctions {
alt{ alt{
//receive MsgIn requestPrimitive //receive MsgIn requestPrimitive
[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) { [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!"); setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
...@@ -596,7 +596,7 @@ module OneM2M_PermutationFunctions { ...@@ -596,7 +596,7 @@ module OneM2M_PermutationFunctions {
alt{ alt{
//receive MsgIn requestPrimitive //receive MsgIn requestPrimitive
[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) { [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container update request is accepted!!"); setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
...@@ -1433,7 +1433,7 @@ module OneM2M_PermutationFunctions { ...@@ -1433,7 +1433,7 @@ module OneM2M_PermutationFunctions {
} }
function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem { function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
//Local variables //Local variables
var ResourceType v_resourceType := int16; //remoteCSE var ResourceType v_resourceType := int16; //remoteCSE
// Test control // Test control
...@@ -2085,7 +2085,7 @@ module OneM2M_PermutationFunctions { ...@@ -2085,7 +2085,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_001_cseSimu }//end f_CSE_DMR_CRE_001_cseSimu
function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
...@@ -2149,7 +2149,7 @@ module OneM2M_PermutationFunctions { ...@@ -2149,7 +2149,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_002 }//end f_CSE_DMR_CRE_002
function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
...@@ -2209,7 +2209,7 @@ module OneM2M_PermutationFunctions { ...@@ -2209,7 +2209,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_003 }//end f_CSE_DMR_CRE_003
function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
......
...@@ -3980,7 +3980,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -3980,7 +3980,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_007() runs on AeSimu {
// Local variables // Local variables
var template RequestPrimitive v_createRequestContainer := m_createContainerBase; var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase; var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
...@@ -4064,7 +4064,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4064,7 +4064,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done; v_ae1.done;
} }
function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_008() runs on AeSimu {
//Local variables //Local variables
var template RequestPrimitive v_createRequestContainer := m_createContainerBase; var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase; var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
...@@ -4152,7 +4152,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4152,7 +4152,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_009() runs on AeSimu {
// Local variables // Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response; var MsgIn v_response;
...@@ -4232,7 +4232,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4232,7 +4232,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_010() runs on AeSimu {
// Local variables // Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response; var MsgIn v_response;
...@@ -4312,7 +4312,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4312,7 +4312,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_011() runs on AeSimu {
// Local variables // Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response; var MsgIn v_response;
...@@ -4580,7 +4580,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4580,7 +4580,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem { function f_CSE_DMR_CRE_013() runs on AeSimu {
// Local variables // Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response; var MsgIn v_response;
...@@ -4809,7 +4809,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4809,7 +4809,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem { function f_CSE_DMR_RET_010() runs on AeSimu {
// Local variables // Local variables
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_containerIndex := -1; var integer v_containerIndex := -1;
...@@ -4886,7 +4886,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -4886,7 +4886,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem { function f_CSE_DMR_RET_012() runs on AeSimu {
// Local variables // Local variables
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_containerIndex := -1; var integer v_containerIndex := -1;
...@@ -6428,7 +6428,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6428,7 +6428,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done; v_ae1.done;
} }
function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem { function f_CSE_DMR_UPD_010() runs on AeSimu {
var MsgIn v_response; var MsgIn v_response;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_containerIndex := -1; var integer v_containerIndex := -1;
...@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done; v_ae1.done;
} }
function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem { function f_CSE_DMR_UPD_011() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
...@@ -6586,7 +6586,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6586,7 +6586,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done; v_ae1.done;
} }
function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem { function f_CSE_DMR_UPD_012() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
...@@ -6671,7 +6671,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -6671,7 +6671,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done; v_ae1.done;
} }
function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem { function f_CSE_DMR_UPD_013() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
...@@ -8285,7 +8285,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -8285,7 +8285,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_DEL_005() runs on AeSimu system CseSystem { function f_CSE_DMR_DEL_005() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
...@@ -8385,7 +8385,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -8385,7 +8385,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem { function f_CSE_DMR_DEL_006() runs on AeSimu {
// Local variables // Local variables
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_containerIndex := -1; var integer v_containerIndex := -1;
...@@ -8454,7 +8454,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -8454,7 +8454,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem { function f_CSE_DMR_DEL_007() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
...@@ -8548,7 +8548,7 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -8548,7 +8548,7 @@ module OneM2M_Testcases_CSE_Release_1 {
} }
function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem { function f_CSE_DMR_DEL_009() runs on AeSimu {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var RequestPrimitive v_request; var RequestPrimitive v_request;
......
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