diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index fa28d6da4aa26fd47059099c691201b034e83943..a2180659e95a19962932a7e4baad3fe32717304c 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 346 2017-08-08 12:49:09Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 352 2017-08-11 15:01:43Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -1812,14 +1812,14 @@ module OneM2M_Functions {
} else if (vc_primitiveScope == e_spRelative) {
if(vc_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) {
- return "/" & PX_CSE_ID;
+ return PX_CSE_ID;
} else {
v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == -1) {
- return "/" & PX_CSE_ID & "/" & PX_CSE_NAME;
+ return PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -1828,14 +1828,14 @@ module OneM2M_Functions {
} else if (vc_primitiveScope == e_absolute) {
if(vc_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) {
- return "//" & PX_SP_ID & "/" & PX_CSE_ID;
+ return PX_SP_ID & PX_CSE_ID;
} else {
v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == -1) {
- return "//" & PX_SP_ID & "/" & PX_CSE_ID & "/" & PX_CSE_NAME;
+ return PX_SP_ID & PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 7c4a97bef0d034ac52c0b8842b44aa279c196698..598305a3d63244b5f651cd848077b7f4d9388694 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 325 2017-07-24 16:17:05Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 352 2017-08-11 15:01:43Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -33,24 +33,48 @@ module OneM2M_Pixits {
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
-
+
+ /**
+ * @desc IUT CSE Name
+ */
modulepar XSD.ID PX_CSE_NAME := "cseName";
-
- modulepar XSD.ID PX_CSE_ID := "cseId";
-
- modulepar XSD.ID PX_SP_ID := "om2m.org";
-
- modulepar XSD.ID PX_CSE1_ID := "MyCSEId";
-
+
+ /**
+ * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE_ID := "/cseId";
+
+ /**
+ * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+ */
+ modulepar XSD.ID PX_SP_ID := "//om2m.org";
+
+ /**
+ * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
+
+ /**
+ * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+ */
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
-
+
+ /**
+ * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
modulepar XSD.ID PX_AE1_ID_STEM := "";
-
+
+ /**
+ * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
modulepar XSD.ID PX_AE2_ID_STEM := "";
modulepar XSD.ID PX_SUPER_USER := "admin:admin";
-
- modulepar XSD.ID PX_APP_ID := "myAppId";
+
+ /**
+ * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_APP_ID := "NMyAppId";
modulepar boolean PX_RUN_POSTAMBLE := true;
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index b91364843521a30d8dde27c06325b573b6c9d70b..88dfb71242e1c4d2d399c06a9f5080f68bf4ffb9 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 350 2017-08-11 13:44:16Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 352 2017-08-11 15:01:43Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -1733,8 +1733,8 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
cseType := omit,//O
pointOfAccess := omit,//O
- cSEBase := "/" & valueof(p_cSEBase),//M
- cSE_ID := "/" & valueof(p_cSE_ID),//M
+ cSEBase := valueof(p_cSEBase),//M
+ cSE_ID := valueof(p_cSE_ID),//M
m2M_Ext_ID := omit,//O
trigger_Recipient_ID := omit,//O
requestReachability := true,//M