Commit 88841135 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'Release1' into master

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents a998027e f105adea
This diff is collapsed.
......@@ -133,8 +133,7 @@ module OneM2M_Templates {
* @param p_targetResourceAddress Target resource address
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveChildReferences(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, template (omit) ResourceTypeList p_resourceTypeList := omit) modifies m_retrieve := {
resultContent := int6,
template (value) RequestPrimitive m_retrieveChildResourceRefs(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, template (omit) ResourceTypeList p_resourceTypeList := omit) modifies m_retrieve := {
filterCriteria := {
createdBefore := omit,
createdAfter := omit,
......@@ -150,7 +149,7 @@ module OneM2M_Templates {
sizeBelow := omit,
contentType_list := {},
attribute_list := {},
filterUsage := omit,
filterUsage := int1,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
......
......@@ -690,9 +690,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
var boolean v_handleResponses := false;
//Test control
......@@ -703,8 +700,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Test Body
vc_ae1.start(f_cse_sendCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, -, "S", omit)));
vc_ae1.done;
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -);
v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
......@@ -714,29 +710,26 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
v_handleResponses := true;
f_cse_sendResponse(v_request);
}
[] mccPortIn.receive(mw_request(mw_createAEAnnc())) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": AE creation redirected but wrong parameters");
v_handleResponses := true;
f_cse_sendResponse(v_request);
}
[] mccPortIn.receive(mw_request(?))-> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected message received");
v_handleResponses := true;
f_cse_sendResponse(v_request);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
}
vc_ae1.done;
// Postamble
if (v_handleResponses) {
vc_ae1.start(f_cse_receiveResponse());
f_cse_sendResponse(v_request);
vc_ae1.done;
}
f_cse_postamble_deleteResourcesCSE();
// Tear down
......@@ -1869,7 +1862,10 @@ module OneM2M_Testcases_CSE_Release_1 {
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); }
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
tc_ac.start(10.0);
repeat;
}
[] tc_ac.timeout {
if(not(v_cseRegistered)) {
setverdict(fail, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
......
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