New testcases for:

TP/oneM2M/CSE/GEN/CRE/BV/001
TP/oneM2M/CSE/GEN/CRE/BV/002
TP/oneM2M/CSE/GEN/RET/BV/001
TP/oneM2M/CSE/GEN/RET/BV/002
TP/oneM2M/CSE/GEN/UPD/BV/001
TP/oneM2M/CSE/GEN/UPD/BV/002
TP/oneM2M/CSE/GEN/DEL/BV/001
TP/oneM2M/CSE/GEN/DEL/BV/002
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent cfe3b59d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author oneM2M * @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 308 2017-06-21 09:44:17Z reinaortega $ * $Id: OneM2M_Functions.ttcn 310 2017-06-23 12:40:44Z reinaortega $
* @desc Module containing functions for oneM2M * @desc Module containing functions for oneM2M
* *
*/ */
...@@ -1619,14 +1619,14 @@ module OneM2M_Functions { ...@@ -1619,14 +1619,14 @@ module OneM2M_Functions {
} else if (vc_primitiveScope == e_absolute) { } else if (vc_primitiveScope == e_absolute) {
if(vc_addressingMethod == e_nonHierarchical) { if(vc_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) { if(p_targetResourceIndex == -1) {
return "//" &"SpId" & "/" & PX_CSE_ID; return "//" & PX_SP_ID & "/" & PX_CSE_ID;
} else { } else {
v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource); v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress; return v_resourceAddress;
} }
} else { } else {
if(p_targetResourceIndex == -1) { if(p_targetResourceIndex == -1) {
return "//" &"SpId" & "/" & PX_CSE_ID & "/" & PX_CSE_NAME; return "//" & PX_SP_ID & "/" & PX_CSE_ID & "/" & PX_CSE_NAME;
} else { } else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource); v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress; return v_resourceAddress;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author oneM2M * @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 307 2017-06-21 08:32:28Z reinaortega $ * $Id: OneM2M_Pics.ttcn 310 2017-06-23 12:40:44Z reinaortega $
* @desc Module containing Pixits for oneM2M * @desc Module containing Pixits for oneM2M
* *
*/ */
...@@ -19,6 +19,8 @@ module OneM2M_Pics { ...@@ -19,6 +19,8 @@ module OneM2M_Pics {
*/ */
modulepar boolean PICS_ACP_SUPPORT := true; modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true; modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
} // end of module } // end of module
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author oneM2M * @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $ * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 307 2017-06-21 08:32:28Z reinaortega $ * $Id: OneM2M_Pixits.ttcn 310 2017-06-23 12:40:44Z reinaortega $
* @desc Module containing Pixits for oneM2M * @desc Module containing Pixits for oneM2M
* *
*/ */
...@@ -38,6 +38,8 @@ module OneM2M_Pixits { ...@@ -38,6 +38,8 @@ module OneM2M_Pixits {
modulepar XSD.ID PX_CSE_ID := "cseId"; modulepar XSD.ID PX_CSE_ID := "cseId";
modulepar XSD.ID PX_SP_ID := "om2m.org";
modulepar XSD.ID PX_CSE1_ID := "MyCSEId"; modulepar XSD.ID PX_CSE1_ID := "MyCSEId";
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId"; modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
......
This diff is collapsed.
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