Commit 3e7fff46 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/HYBRID_ADDRESSING_TEST_CASES' into Release2

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 870201a8 31691310
......@@ -4229,13 +4229,20 @@ module OneM2M_Functions {
} else {
return f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
}
} else {
} else if (p_addressingMethod == e_hierarchical){
if(p_targetResourceIndex == -1) {
return PX_CSE_NAME;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else if (p_addressingMethod == e_hybrid){
if(p_targetResourceIndex == -1) {
return PX_CSE_RESOURCE_ID;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, e_nonHierarchical, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
} else if (p_primitiveScope == e_spRelative) {
......@@ -4246,13 +4253,20 @@ module OneM2M_Functions {
v_resourceAddress := PX_CSE_ID & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
} else if (p_addressingMethod == e_hierarchical){
if(p_targetResourceIndex == -1) {
return PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else if (p_addressingMethod == e_hybrid){
if(p_targetResourceIndex == -1) {
return PX_CSE_ID & "/" & PX_CSE_RESOURCE_ID;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, e_nonHierarchical, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
} else if (p_primitiveScope == e_absolute) {
if(p_addressingMethod == e_nonHierarchical) {
......@@ -4262,14 +4276,21 @@ module OneM2M_Functions {
v_resourceAddress := PX_SP_ID & PX_CSE_ID & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
} else if (p_addressingMethod == e_hierarchical){
if(p_targetResourceIndex == -1) {
return PX_SP_ID & PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
} else if (p_addressingMethod == e_hybrid){
if(p_targetResourceIndex == -1) {
return PX_SP_ID & PX_CSE_ID & "/" & PX_CSE_RESOURCE_ID;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, e_nonHierarchical, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
} else {
return "";
}
......
......@@ -8690,7 +8690,8 @@ group OtherTypes {
type enumerated AddressingMethod {
e_nonHierarchical,
e_hierarchical
e_hierarchical,
e_hybrid
}
type union Resource_2 {
......
This diff is collapsed.
......@@ -123,8 +123,48 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}// end of group g_CSE_GEN_CRE_003
group g_CSE_GEN_CRE_004 {
/**
* @desc Check that the IUT accepts the creation of a <container> resource using structured resource identifier with hybrid addressing.
*
*/
testcase TC_CSE_GEN_CRE_004_CSR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_CRE_004(e_cseRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_CRE_004_SPR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_CRE_004(e_spRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_CRE_004_ABS() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_CRE_004(e_absolute));
v_ae1.done;
}
} // end of group g_CSE_GEN_CRE_004
} // end of group Create
group Retrieve {
......@@ -169,6 +209,48 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end of group g_CSE_GEN_RET_003
group g_CSE_GEN_RET_004 {
/**
* @desc Check that the IUT accepts the retrieval of a <container> resource using structured resource identifier with hybrid addressing.
*
*/
testcase TC_CSE_GEN_RET_004_CSR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_RET_004(e_cseRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_RET_004_SPR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_RET_004(e_spRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_RET_004_ABS() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_RET_004(e_absolute));
v_ae1.done;
}
} // end of group g_CSE_GEN_RET_004
} // end of group Retrieve
group Update {
......@@ -214,6 +296,48 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end of group g_CSE_GEN_UPD_003
group g_CSE_GEN_UPD_004 {
/**
* @desc Check that the IUT accepts the update of a <container> resource using structured resource identifier with hybrid addressing..
*
*/
testcase TC_CSE_GEN_UPD_004_CSR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_UPD_004(e_cseRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_UPD_004_SPR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_UPD_004(e_spRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_UPD_004_ABS() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_UPD_004(e_absolute));
v_ae1.done;
}
} // end of group g_CSE_GEN_UPD_004
} // end of group Update
group Delete {
......@@ -259,6 +383,48 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end of group g_CSE_GEN_DEL_003
group g_CSE_GEN_DEL_004 {
/**
* @desc Check that the IUT accepts the deletion of a <container> resource using structured resource identifier with hybrid addressing.
*
*/
testcase TC_CSE_GEN_DEL_004_CSR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_DEL_004(e_cseRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_DEL_004_SPR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_DEL_004(e_spRelative));
v_ae1.done;
}
testcase TC_CSE_GEN_DEL_004_ABS() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_CSE_GEN_DEL_004(e_absolute));
v_ae1.done;
}
} // end of group g_CSE_GEN_DEL_004
} // end of group Delete
} // end of group Generic
......
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