From c40aae94e1d96b8eb9b4a88af0ffab5f851497f5 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 17 May 2017 11:44:59 +0200
Subject: [PATCH] m_eventNotificationCriteria corrected
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 6 +++---
OneM2M_Testcases.ttcn | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index e2a5389..e14d818 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 273 2017-05-17 08:53:18Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 274 2017-05-17 09:44:46Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -1497,7 +1497,7 @@ module OneM2M_Templates {
subscriberURI := p_subscriberURI//O
};
- template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, in EventNotificationCriteria.attribute p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
+ template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
@@ -1509,7 +1509,7 @@ module OneM2M_Templates {
sizeAbove := omit,
sizeBelow := omit,
operationMonitor_list := {},
- attribute := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
+ attribute := p_attribute_list,
notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
missingData := omit
};
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 90406c4..1df87b9 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 273 2017-05-17 08:53:18Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 274 2017-05-17 09:44:46Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -10847,7 +10847,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}, -)); // TODO this field is initialised 2 time with parent adress resource (here and in f_cse_createResource)
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}, -));
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
--
GitLab