From 2adcfed9825d59f50fc8c8fc6545a037f7930a3a Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 6 Apr 2018 11:28:11 +0200
Subject: [PATCH] ScheduleEntry type pattern corrected
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 2 +-
LibOneM2M/OneM2M_Types.ttcn | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 5a0e161..222c8ef 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1020,7 +1020,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
- primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 *"}})}
+ primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 5ca5f27..61e2052 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -1497,7 +1497,7 @@ with {
};
-type XSD.String ScheduleEntry //TODO To fix pattern (pattern "(([\*]|[1-5]#(0,1)\d([,\-\/][1-5]#(0,1)\d)#(0,))[\q{0,0,0,20}\q{0,0,0,10}\t\r]#(1,))#2([\*]|((1#(0,1)\d|2[0-3])([,\-\/](1#(0,1)\d|2[0-3]))#(0,)))[\q{0,0,0,20}\q{0,0,0,10}\t\r]#(1,)([\*]|(([1-9]|1\d|2\d|3[01])([,\-\/]([1-9]|1\d|2\d|3[01]))#(0,)))[\q{0,0,0,20}\q{0,0,0,10}\t\r]#(1,)([\*]|(([1-9]|1[0-2])([,\-\/]([1-9]|1[0-2]))#(0,)))[\q{0,0,0,20}\q{0,0,0,10}\t\r]#(1,)([\*]|([0-6]([,\-\/][0-6])#(0,)))[\q{0,0,0,20}\q{0,0,0,10}\t\r]#(1,)([\*]|([2-9]\d\d\d)(([,\-]([2-9]\d\d\d)([\/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))#(0,)))")
+type XSD.String ScheduleEntry (pattern "(([*]|[1-5]#(0,1)\d([,\-\/][1-5]#(0,1)\d)#(0,))\s#(1,))#2([*]|((1#(0,1)\d|2[0-3])([,\-\/](1#(0,1)\d|2[0-3]))#(0,)))\s#(1,)([*]|(([1-9]|1\d|2\d|3[01])([,\-\/]([1-9]|1\d|2\d|3[01]))#(0,)))\s#(1,)([*]|(([1-9]|1[0-2])([,\-\/]([1-9]|1[0-2]))#(0,)))\s#(1,)([*]|([0-6]([,\-\/][0-6])#(0,)))\s#(1,)([*]|[2-9]\d\d\d([,\-][2-9]\d\d\d)#(0,))([\/]\d#(0,1)\d#(0,1)\d#(0,1)\d#(0,1))#(0,1)")
with {
variant "name as uncapitalized";
};
--
GitLab