From bab67b109007450085561f4554eb07be4a82492a Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 24 Jul 2017 18:17:48 +0200
Subject: [PATCH] Renaming of PXT_FROM_IS_AE_ID to
PX_USE_RESOURCE_ID_AS_ORIGINATOR
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 27 +++++++++++++++++----------
LibOneM2M/OneM2M_Pixits.ttcn | 4 ++--
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e6677ed..9f35628 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 319 2017-07-14 15:20:23Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 325 2017-07-24 16:17:05Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -357,11 +357,13 @@ module OneM2M_Functions {
//For deletion of AEs, priority is to use AE-ID in From parameter
//For other resources PX_SUPER_USER should be able to do DELETE operation
- if(PX_FROM_IS_AE_ID){
- if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE)) {
- v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE.aE_ID;
- }
- }
+ //TODO Replace below code by f_getOriginator
+ v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]);
+// if(PX_USE_RESOURCE_ID_AS_ORIGINATOR){
+// if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE)) {
+// v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE.aE_ID;
+// }
+// }
mcaPort.send(m_request(v_request));
@@ -1339,7 +1341,7 @@ module OneM2M_Functions {
if (p_resourceType == int9) {//group
if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
- p_request.primitiveContent.group_.memberIDs := {f_getResourceAddress(p_parentIndex)};
+ p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
}
}
@@ -1567,11 +1569,16 @@ module OneM2M_Functions {
return PX_SUPER_USER;
}
- if(PX_FROM_IS_AE_ID) {
- if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
- return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
+ if(PX_USE_RESOURCE_ID_AS_ORIGINATOR) {
+ if(vc_resourcesList[p_targetResourceIndex].parentIndex == -1) {
+ return f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
} else {
return f_getOriginator(vc_resourcesList[p_targetResourceIndex].parentIndex);
+// if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
+// return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
+// } else {
+// return f_getOriginator(vc_resourcesList[p_targetResourceIndex].parentIndex);
+// }
}
} else {
return PX_SUPER_USER;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index bac6872..7c4a97b 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 317 2017-07-12 18:07:15Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 325 2017-07-24 16:17:05Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -64,7 +64,7 @@ module OneM2M_Pixits {
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
- modulepar boolean PX_FROM_IS_AE_ID := true;
+ modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
//for checking whether the locationPolicy creation request is originated from a ASN-AE
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
--
GitLab