diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 82fcaf906da5580052ff6c9c82db022638242a65..3973b432816aa3d9b2715407e0bf081c425487a1 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -973,7 +973,7 @@ module OneM2M_Functions {
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := vc_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_response));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
[] tc_ac.timeout {
@@ -1104,7 +1104,7 @@ module OneM2M_Functions {
v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
- mcaPort.send(m_request(v_request, p_nullFields));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1441,7 +1441,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
}
@@ -1460,7 +1460,7 @@ module OneM2M_Functions {
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
}
@@ -1643,14 +1643,14 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__ & ":INFO: Notification received with the expected content");
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- mcaPortIn.send(m_response(v_responsePrimitive));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- mcaPortIn.send(m_response(v_responsePrimitive));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
@@ -1790,7 +1790,7 @@ module OneM2M_Functions {
v_request.from_ := PX_CSE1_ID;
- mccPort.send(m_request(v_request));
+ mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, mw_primitiveContentNotification(mw_contentNotification_any)))) -> value vc_response {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index de3f76242071dc50f4b17fafe8762e21192c23ad..0bd7dc23d0213d82c4e32e9ceb63d5e05af9533c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -60,12 +60,12 @@ module OneM2M_PermutationFunctions {
v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
- mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(v_responsePrimitive))));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] mcaPortIn.receive(mw_request(?)) {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : Error while creating container");
- mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
stop;
}
[] tc_ac.timeout {
@@ -3010,8 +3010,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
- {"pi", "ct"}, f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ {"pi", "ct"}, f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
@@ -3067,8 +3067,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl"}, f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl"}, f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
@@ -3119,8 +3119,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl", "at"}, f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl", "at"}, f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
@@ -3535,8 +3535,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
- {"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ {"pi", "ct"}, f_getOriginator(v_aeIndex)))));//from AE ID
tc_ac.start;
alt {
@@ -3617,8 +3617,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl"}, f_getOriginator(v_aeIndex)))));//from AE ID
tc_ac.start;
alt {
@@ -3695,8 +3695,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- mcaPort.send(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl", "at"}, f_getOriginator(v_aeIndex)))));//from AE ID
tc_ac.start;
alt {
@@ -6519,6 +6519,7 @@ module OneM2M_PermutationFunctions {
var integer v_remoteCSEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
//TODO var template RequestPrimitive v_remoteCSEAnnc := mw_createAccessControlPolicyAnnc;
// Test control
@@ -6580,7 +6581,7 @@ module OneM2M_PermutationFunctions {
v_CntAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_CntAnncResourceIndex));
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
@@ -6620,6 +6621,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
// Test control
@@ -6678,6 +6680,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -6736,6 +6739,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -6793,6 +6797,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -6856,6 +6861,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -6912,6 +6918,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -7002,7 +7009,7 @@ module OneM2M_PermutationFunctions {
v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc);
// Test Body
- mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7088,6 +7095,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7154,6 +7162,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7234,7 +7243,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_deleteHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- mcaPort.send(m_request(v_updateRequest, p_nullFields));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
tc_ac.start;
alt {
@@ -7280,6 +7289,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7322,6 +7332,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7359,7 +7370,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_responsePrimitive));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -7387,6 +7398,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7446,6 +7458,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7522,7 +7535,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_updateHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- mcaPort.send(m_request(v_updateRequest));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
tc_ac.start;
alt {
@@ -7568,6 +7581,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7605,7 +7619,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_responsePrimitive));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -7633,6 +7647,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7670,7 +7685,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_responsePrimitive));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -7698,6 +7713,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7735,7 +7751,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_responsePrimitive));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -7762,6 +7778,7 @@ module OneM2M_PermutationFunctions {
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -7799,7 +7816,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
- mccPortIn.send(m_response(v_responsePrimitive));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -7844,7 +7861,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_updateHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- mcaPort.send(m_request(v_updateRequest, p_nullFields));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
tc_ac.start;
alt {
@@ -7908,7 +7925,7 @@ module OneM2M_PermutationFunctions {
v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_AEAnncResourceIndex));
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- mcaPort.send(m_request(v_updateRequest));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));
tc_ac.start;
alt {
@@ -7974,7 +7991,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_deleteHandler());
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
@@ -8021,6 +8038,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -8115,7 +8133,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response {
@@ -8183,7 +8201,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -8211,7 +8229,7 @@ module OneM2M_PermutationFunctions {
//Check to see if the resource is present or not
if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
- mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -8283,7 +8301,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response {
@@ -8326,7 +8344,7 @@ module OneM2M_PermutationFunctions {
v_statusCode := int2002;
v_primitiveContent := omit;
}
- mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponseRequestResource))) -> value v_response{
@@ -8344,7 +8362,7 @@ module OneM2M_PermutationFunctions {
setverdict(fail, testcasename() & ": RequestStatus: FAIL");
}else{ //PENDING, FORWARDING or PARTIALLY_COMPLETED
f_sleep(PX_TAC/5.0);
- mcaPort.send(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
repeat;
}
}
@@ -8408,7 +8426,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response {
@@ -8487,7 +8505,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -8515,7 +8533,7 @@ module OneM2M_PermutationFunctions {
//Check to see if the resource is present or not
if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
- mcaPort.send(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -8581,7 +8599,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.responseType.responseTypeValue := int2; //nonBlockingRequestAsynch
p_requestPrimitive.responseType.notificationURI := omit; //"...no notification target list is provided"
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -8659,7 +8677,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index c82ab12ea303b5b06336bdf7cf3186c699b49b0d..e32568516edd0521a3a6ef6cca7a3d213796698c 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
- mcaPort.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_request(v_request))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
t_ac.start;
alt {
@@ -4785,13 +4785,13 @@ module OneM2M_Testcases_CSE_Release_2 {
}
testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem {
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventCat v_eventCat:= {alt_1:= 300};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -7441,7 +7441,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-
+
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_CRE_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -7458,6 +7459,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -7470,6 +7472,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequestAnnc, v_updateRequest));//Container
@@ -7482,6 +7485,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group
@@ -7497,6 +7501,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_CRE_003(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -7514,6 +7519,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -7526,6 +7532,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -7538,6 +7545,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -7550,6 +7558,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -7566,6 +7575,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -7578,6 +7588,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -7590,6 +7601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -7603,6 +7615,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -7619,6 +7632,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -7631,6 +7645,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -7643,6 +7658,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -7656,6 +7672,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -7672,6 +7689,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -7684,6 +7702,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -7696,6 +7715,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
@@ -7709,6 +7729,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -7725,6 +7746,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"maxByteSize"};
@@ -7738,6 +7760,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.announcedAttribute := {"contentInfo"};
@@ -7751,6 +7774,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.announcedAttribute := {"memberType"};
@@ -7765,6 +7789,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.announcedAttribute := {"locationContainerID"};
@@ -7782,6 +7807,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.labels := {"MyLabel"};
@@ -7801,6 +7827,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
v_ae1.done;
}
@@ -7811,6 +7838,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_001(int3, v_createRequestAnnc, v_createRequest));//Container
v_ae1.done;
}
@@ -7821,6 +7849,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_001(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
v_ae1.done;
}
@@ -7831,6 +7860,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_001(int9, v_createRequestAnnc, v_createRequest));//Group
v_ae1.done;
}
@@ -7845,6 +7875,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
v_ae1.done;
}
@@ -7855,6 +7886,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_002(int3, v_createRequestAnnc, v_createRequest));//Container
v_ae1.done;
}
@@ -7865,6 +7897,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_002(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
v_ae1.done;
}
@@ -7875,6 +7908,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_ANNC_RET_002(int9, v_createRequestAnnc, v_createRequest));//Group
v_ae1.done;
}
@@ -7894,6 +7928,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_001(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -7907,6 +7942,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_001(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -7920,6 +7956,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -7939,6 +7976,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var ListOfURIs v_announceTo := {"To be deleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -7957,6 +7995,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var ListOfURIs v_announceTo := {"To be deleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -7975,6 +8014,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var ListOfURIs v_announceTo := {"To be deleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -7999,6 +8039,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var ListOfURIs v_announceTo := {"To be deleted"};
var PrimitiveContent v_primitiveContentRetrieveResource;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := v_announceTo;
@@ -8040,6 +8081,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var ListOfURIs v_announceTo := {"To be deleted"};
var PrimitiveContent v_primitiveContentRetrieveResource;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.container.announceTo := v_announceTo;
@@ -8081,6 +8123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var ListOfURIs v_announceTo := {"To be deleted"};
var PrimitiveContent v_primitiveContentRetrieveResource;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.group_.announceTo := v_announceTo;
@@ -8121,6 +8164,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"ToBeDeleted"};
v_updateRequest.primitiveContent.accessControlPolicy.parentID := PX_CSE1_ID;
@@ -8136,6 +8180,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.container.announcedAttribute := {"ToBeDeleted"};
v_updateRequest.primitiveContent.container.parentID := PX_CSE1_ID;
@@ -8151,6 +8196,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.group_.announcedAttribute := {"ToBeDeleted"};
v_updateRequest.primitiveContent.group_.parentID := PX_CSE1_ID;
@@ -8174,6 +8220,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var Labels v_labels_2 := {"To be deleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.labels := v_labels_1;
@@ -8207,6 +8254,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_006(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -8220,6 +8268,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_006(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -8233,6 +8282,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -8249,6 +8299,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_007(int1, v_createRequest, v_createRequestAnnc, v_updateRequest));//AccessControlPolicy
@@ -8262,6 +8313,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_007(int3, v_createRequest, v_createRequestAnnc, v_updateRequest));//Container
@@ -8275,6 +8327,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group
@@ -8296,6 +8349,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
var XSD.NonNegativeInteger v_maxByteSize := 512;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
@@ -8342,6 +8396,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
var MemberType v_memberType := int3;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.memberType := v_memberType;
v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
@@ -8388,6 +8443,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
var XSD.NonNegativeInteger v_maxByteSize := 512;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
@@ -8410,6 +8466,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
var MemberType v_memberType := int3;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.memberType := v_memberType;
@@ -8437,6 +8494,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var Timestamp v_expirationTime_1 := "21001231T012345";
var Timestamp v_expirationTime_2 := "21101231T012345";
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
@@ -8460,6 +8518,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var Timestamp v_expirationTime_1 := "21001231T012345";
var Timestamp v_expirationTime_2 := "21101231T012345";
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
@@ -8483,6 +8542,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var Timestamp v_expirationTime_1 := "21001231T012345";
var Timestamp v_expirationTime_2 := "21101231T012345";
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.expirationTime := v_expirationTime_1;
@@ -8510,6 +8570,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
var XSD.NonNegativeInteger v_maxByteSize_2 := 1024;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
@@ -8534,6 +8595,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var MemberType v_memberType_1 := int3;
var MemberType v_memberType_2 := int4;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
@@ -8564,6 +8626,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
@@ -8602,6 +8665,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AttributeAux_list v_nullFields;
var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.memberType := v_memberType;
v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
@@ -8643,6 +8707,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
var XSD.NonNegativeInteger v_maxByteSize := 512;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
@@ -8687,6 +8752,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
var MemberType v_memberType := int3;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.memberType := v_memberType;
v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
@@ -8730,6 +8796,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_UPD_014(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
@@ -8759,6 +8826,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -8771,6 +8839,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -8783,6 +8852,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -8799,6 +8869,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
@@ -8811,6 +8882,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
@@ -8823,6 +8895,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
@@ -8844,6 +8917,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_PCH_001());
v_ae1.done;
@@ -8874,7 +8948,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
@@ -8918,6 +8992,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_PCH_002());
v_ae1.done;
@@ -8952,7 +9027,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
@@ -8988,6 +9063,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_PCH_003());
v_ae1.done;
@@ -9019,7 +9095,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- mcaPort.send(m_request(v_request));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
@@ -9047,7 +9123,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
- mcaPort.send(m_request(v_requestNotify));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
//Postamble
f_cse_postamble_deleteResources();
@@ -9060,6 +9136,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_cse1.start(f_CSE_PCH_004());
v_cse1.done;
@@ -9111,7 +9188,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
- mccPortIn.send(m_response(v_response_rsp1));
+ mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1)));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -9151,7 +9228,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer v_aeIndex2 := -1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
v_request.to_ := f_getResourceAddress(v_aeIndex2);
@@ -9168,7 +9245,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer v_aeIndex2 := -1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_aeIndex1), f_getOriginator(v_aeIndex1)));
@@ -9180,14 +9257,13 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_PCH_005_UPD() runs on Tester system CseSystem {
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RequestPrimitive v_request;
var integer v_aeIndex1 := -1;
var integer v_aeIndex2 := -1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
@@ -9208,7 +9284,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer v_aeIndex2 := -1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
-
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_request := f_getCreateRequestPrimitive(int15, v_createRequest, v_aeIndex1);
@@ -9246,7 +9322,7 @@ module OneM2M_Testcases_CSE_Release_2 {
p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
- mcaPort.send(m_request(p_requestprimitive));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -9270,6 +9346,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1);
v_cse1.start(f_CSE_PCH_006());
v_cse1.done;
@@ -9305,7 +9382,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
v_request.from_ := PX_CSE1_ID;
- mccPort.send(m_request(v_request));
+ mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
@@ -9346,6 +9423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container
v_ae1.done;
@@ -9358,6 +9436,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_SYN_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -9370,6 +9449,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
v_ae1.done;
@@ -9380,6 +9460,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
v_ae1.done;
@@ -9398,6 +9479,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container
v_ae1.done;
@@ -9410,6 +9492,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_SYN_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -9422,6 +9505,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
v_ae1.done;
@@ -9432,6 +9516,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
v_ae1.done;
@@ -9450,6 +9535,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container
v_ae1.done;
@@ -9462,6 +9548,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_SYN_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
@@ -9474,6 +9561,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container
v_ae1.done;
@@ -9484,6 +9572,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container
v_ae1.done;
@@ -9505,6 +9594,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container
v_ae1.done;
@@ -9517,6 +9607,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_ASY_001(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -9529,6 +9620,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
v_ae1.done;
@@ -9539,6 +9631,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
v_ae1.done;
@@ -9557,6 +9650,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container
v_ae1.done;
@@ -9569,6 +9663,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_ASY_002(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -9581,6 +9676,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
v_ae1.done;
@@ -9591,6 +9687,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
v_ae1.done;
@@ -9609,6 +9706,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container
v_ae1.done;
@@ -9621,6 +9719,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_ASY_003(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container
@@ -9633,6 +9732,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container
v_ae1.done;
@@ -9643,6 +9743,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container
v_ae1.done;
@@ -9661,6 +9762,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container
v_ae1.done;
@@ -9673,6 +9775,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_NBR_ASY_004(m_updateContainerBase, m_createContainerBase)); //Update Container
@@ -9685,6 +9788,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container
v_ae1.done;
@@ -9695,6 +9799,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container
v_ae1.done;
@@ -9717,6 +9822,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_TS_001());
v_ae1.done;
@@ -9747,7 +9853,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//Create data points and force a missingDataPoint
f_cse_generateMissingDataPoint(v_resourceIndex);
// Test Body
- mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -9795,6 +9901,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_TS_002());
v_ae1.done;
@@ -9828,7 +9935,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cse_generateMissingDataPoint(v_resourceIndex);
//Retrieve first missing data point
- mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
@@ -9872,7 +9979,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cse_generateMissingDataPoint(v_resourceIndex);
//Retrieve second missing data point
- mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
@@ -9934,6 +10041,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_TS_003());
v_ae1.done;
@@ -10000,6 +10108,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
v_ae1.start(f_CSE_TS_004());
v_ae1.done;
@@ -10056,7 +10165,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- mcaPortIn.send(m_response(v_responsePrimitive));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(pass, __SCOPE__ & ": Notification not received");
@@ -10064,7 +10173,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
//Check if the IUT restarts missing data point counter and timer
- mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex))));
+ mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex)))));
v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
v_contentResponse.timeSeries.missingDataCurrentNr := 0;