Commit 41592783 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

- Implemented changes according to TDE-2019-0043R01 for:



     TC_CSE_REG_CRE_001, TC_CSE_REG_CRE_002 and TC_CSE_REG_CRE_003
     Deletion of TC_CSE_REG_CRE_020

- Update of IN and MN profiles files
Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 2679037f
...@@ -1720,230 +1720,338 @@ module OneM2M_PermutationFunctions { ...@@ -1720,230 +1720,338 @@ module OneM2M_PermutationFunctions {
group Create{ group Create{
function f_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu { function f_CSE_REG_CRE_001(in XSD.ID v_aeIdStem) runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is allowed to register: " & PX_ALLOWED_C_AE_IDS[0];
//Test control
if(v_aeIdStem[0] == "S") {
if(not(PICS_IN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
stop;
}
}
//Local variables // Test component configuration
var MsgIn v_response; f_cf01Up();
var RequestPrimitive v_request;
var ResourceType v_resourceType := int2; //AE //Preamble
action(v_action);
// Test control f_sleepIgnoreDef(PX_TCONFIG_IUT);
// Test component configuration //Test Body
f_cf01Up(); v_request := valueof(m_createAe(PX_APP_ID, omit, PX_CSE_ID & "/" & v_aeIdStem));
//Test Body v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
v_request := valueof(p_createAe); mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
tc_ac.start;
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); alt {
tc_ac.start; [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
alt { tc_ac.stop;
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{ f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
tc_ac.stop; vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive); setverdict(pass, __SCOPE__ & ": AE successfully created.");
vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE creation successfull.");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
} }
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
}
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
//Postamble }
f_cse_postamble_deleteResources();
function f_CSE_REG_CRE_002(in XSD.ID v_aeIdStem) runs on AeSimu {
// Tear down
f_cf01Down(); var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
//Test control
if(v_aeIdStem[0] == "S") {
if(not(PICS_IN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
stop;
}
} }
// Test component configuration
f_cf01Up();
//Preamble
//Test Body
v_request := valueof(m_createAe(PX_APP_ID, omit, v_aeIdStem));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
}
function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu { // Postamble
f_cse_postamble_deleteResources();
// Local variables // Tear down
var MsgIn v_response; f_cf01Down();
var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE }
// Test control function f_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var ResourceType v_resourceType := int2; //AE
// Test control
// Test component configuration
f_cf01Up();
// Test component configuration //Test Body
f_cf04Up();
// Test adapter configuration v_request := valueof(p_createAe);
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
// Preamble mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE creation successfull.");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
}
// Test Body //Postamble
v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1); f_cse_postamble_deleteResources();
mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); // Tear down
tc_ac.start; f_cf01Down();
alt { }
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute " & p_optionalAttribute.name);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
}
}
// Postamble function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
f_cse_postamble_deleteResourcesCSE();
// Local variables
// Tear down var MsgIn v_response;
f_cf04Down(); var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE
}//end f_CSE_REG_CRE_BV_013
// Test control
// Test component configuration
f_cf04Up();
// Test adapter configuration
// Preamble
// Test Body
v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1);
mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
f_setResource(v_response.primitive.responsePrimitive.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute " & p_optionalAttribute.name);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
}
}
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
}//end f_CSE_REG_CRE_BV_013
function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu { //Local variables
var ResourceType v_resourceType := int2;
//Local variables var RequestPrimitive v_request;
var ResourceType v_resourceType := int2;
var RequestPrimitive v_request; // Test control
// Test control
// Test component configuration // Test component configuration
f_cf01Up(); f_cf01Up();
// Test adapter configuration // Test adapter configuration
// Preamble // Preamble
// Test Body // Test Body
v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1); v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1);
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start; tc_ac.start;
alt { alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Request successfully rejected"); setverdict(pass, __SCOPE__ & ": Request successfully rejected");
} }
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop; tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code"); setverdict(fail, __SCOPE__ & ": Wrong response status code");
} }
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)){
tc_ac.stop; tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, AE has been registered"); setverdict(fail, __SCOPE__ & ": Error, AE has been registered");
} }
[] tc_ac.timeout { [] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource"); setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
} }
} }
// Postamble // Postamble
f_cse_postamble_deleteResources(); f_cse_postamble_deleteResources();
// Tear down // Tear down
f_cf01Down(); f_cf01Down();
} }
function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu { function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var MsgIn v_request; var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive; var ResponsePrimitive v_responsePrimitive;
//Test control //Test control
if(not(PICS_MN_CSE or PICS_ASN_CSE)) { if(not(PICS_MN_CSE or PICS_ASN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE or ASN-CSE to run this test case"); setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE or ASN-CSE to run this test case");
stop; stop;
} }
//Test component configuration //Test component configuration
f_cf04Up(); f_cf04Up();
//send triggering primitive to SUT //send triggering primitive to SUT
f_sendUtPrimitive(p_utRequest,p_action); f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior //Test behavior
tc_ac.start; tc_ac.start;
alt{ alt{
//receive MsgIn requestPrimitive //receive MsgIn requestPrimitive
[] mccPortIn.receive(mw_request(p_request)) -> value v_request { [] mccPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly"); setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
//set responseStatusCode back to SUT //set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit)); v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive //send back responsePrimitive
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
} }
[] mccPortIn.receive { [] mccPortIn.receive {
tc_ac.stop; tc_ac.stop;
setverdict(fail, __SCOPE__&":INFO: Unexpected message received"); setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
} }
[] tc_ac.timeout { [] tc_ac.timeout {
setverdict(fail, __SCOPE__&":INFO: No request received for creating resource type remoteCSE"); setverdict(fail, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
}
} }
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
} }
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
}
function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
// Test control
// Test component configuration
f_cf04Up();
// Test adapter configuration
// Preamble
function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
//Local variables //Test Body
var ResourceType v_resourceType := int16; //remoteCSE vc_remoteCseIndex := f_cse_registerRemoteCse(p_request, p_contentResponse);
// Test control
//Check if the resource has been deleted or not
// Test component configuration if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
f_cf04Up(); setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
// Test adapter configuration setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
}
// Preamble
// Postamble
f_cse_postamble_deleteResourcesCSE();
//Test Body
vc_remoteCseIndex := f_cse_registerRemoteCse(p_request, p_contentResponse); // Tear down
f_cf04Down();
//Check if the resource has been deleted or not
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) { }//end TC_CSE_REG_CRE_028
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
}
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_028
} //end group Create } //end group Create
......
...@@ -81,8 +81,10 @@ module OneM2M_TestControl_IN_profile { ...@@ -81,8 +81,10 @@ module OneM2M_TestControl_IN_profile {
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());} if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_CAE());}
if(true) {execute (TC_CSE_REG_CRE_002());} if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_SAE());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_CAE());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_SAE());}
//CE_REG_00004 //CE_REG_00004
if(true) {execute (TC_CSE_REG_CRE_018());} if(true) {execute (TC_CSE_REG_CRE_018());}
......
...@@ -85,10 +85,10 @@ module OneM2M_TestControl_MN_profile { ...@@ -85,10 +85,10 @@ module OneM2M_TestControl_MN_profile {
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(true) {execute (TC_CSE_REG_CRE_002());} if(true) {execute (TC_CSE_REG_CRE_001_CAE());}
//if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED if(true) {execute (TC_CSE_REG_CRE_002_CAE());}
if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());} if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
//CE_REG_00004 //CE_REG_00004
if(true) {execute (TC_CSE_REG_CRE_018());} if(true) {execute (TC_CSE_REG_CRE_018());}
if(true) {execute (TC_CSE_REG_CRE_019());} if(true) {execute (TC_CSE_REG_CRE_019());}
......
...@@ -436,168 +436,124 @@ module OneM2M_Testcases_CSE_Release_1 { ...@@ -436,168 +436,124 @@ module OneM2M_Testcases_CSE_Release_1 {
group Create{ group Create{
/** /**
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_relative_ AE_ID. * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_RELATIVE_ AE_ID.
* *
*/ */
testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem { group g_CSE_REG_CRE_001 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive; testcase TC_CSE_REG_CRE_001_CAE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done; v_ae1.done;
v_ae1.start(f_CSE_REG_CRE_001()); v_ae1.start(f_CSE_REG_CRE_001(PX_ALLOWED_C_AE_IDS[0]));
v_ae1.done;
v_ae1.done;