Commit 964847b0 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

ScheduleEntry type pattern corrected


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 18c200f4
......@@ -990,7 +990,7 @@ module OneM2M_Types {
};
type XSD.String ScheduleEntry //TODO To be fixed (pattern "(([*]|[1-5]#(0,1)\d([,-][1-5]#(0,1)\d)*)[\q{0,0,0,20}\q{0,0,0,10}\t\r]+)#(2)([*]|((1#(0,1)\d|2[0-3])([,-](1#(0,1)\d|2[0-3]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([0-6]([,-][0-6])*))")
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,)))")
with {
variant "name as uncapitalized";
};
......
......@@ -1448,7 +1448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var RequestPrimitive v_requestPrimitive;
var ScheduleEntries scheduleElement := {{"0,0,0 1 2,1,1,*"}};
var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 *"}};
v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP?
......@@ -3308,8 +3308,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_createRequest.primitiveContent.schedule.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1
v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1
v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 *"}};//Attribute 1
v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
......
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