Commit 14dc291f99518d1e309e7ae47c2ce887e9159edf

Authored by Miguel Angel Reina Ortega
1 parent d446c288

Moved to XSD v2.8.0

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author ETSI
9 9 * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
10   - * $Id: OneM2M_Functions.ttcn 169 2016-11-21 09:45:43Z reinaortega $
  10 + * $Id: OneM2M_Functions.ttcn 170 2016-11-21 15:53:54Z reinaortega $
11 11 * @desc Module containing functions for oneM2M
12 12 *
13 13 */
... ... @@ -494,8 +494,9 @@ module OneM2M_Functions {
494 494 {
495 495 accessControlOriginators := PX_ACOR, //{"admin:admin"}
496 496 accessControlOperations := valueof(p_allowedOperations),
497   - accessControlContexts_list := omit,
498   - accessControlAuthenticationFlag := omit
  497 + accessControlContexts_list := {},
  498 + accessControlAuthenticationFlag := omit,
  499 + accessControlObjectDetails_list := {}
499 500 }
500 501 };
501 502  
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author ETSI
9 9 * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
10   - * $Id: OneM2M_Templates.ttcn 167 2016-11-18 10:54:25Z reinaortega $
  10 + * $Id: OneM2M_Templates.ttcn 170 2016-11-21 15:53:54Z reinaortega $
11 11 * @desc Module containing templates for oneM2M
12 12 *
13 13 */
... ... @@ -108,7 +108,7 @@ module OneM2M_Templates {
108 108 tokens := omit,
109 109 tokenIDs := omit,
110 110 localTokenIDs := omit,
111   - tokenReqIndicator := omit
  111 + tokenRequestIndicator := omit
112 112 };
113 113  
114 114 /**
... ... @@ -139,7 +139,7 @@ module OneM2M_Templates {
139 139 tokens := omit,
140 140 tokenIDs := omit,
141 141 localTokenIDs := omit,
142   - tokenReqIndicator := omit
  142 + tokenRequestIndicator := omit
143 143 };
144 144  
145 145 /**
... ... @@ -170,7 +170,7 @@ module OneM2M_Templates {
170 170 tokens := omit,
171 171 tokenIDs := omit,
172 172 localTokenIDs := omit,
173   - tokenReqIndicator := omit
  173 + tokenRequestIndicator := omit
174 174 };
175 175  
176 176 /**
... ... @@ -204,7 +204,7 @@ module OneM2M_Templates {
204 204 tokens := omit,
205 205 tokenIDs := omit,
206 206 localTokenIDs := omit,
207   - tokenReqIndicator := omit
  207 + tokenRequestIndicator := omit
208 208 };
209 209 }//end group Retrieve
210 210  
... ... @@ -233,7 +233,7 @@ module OneM2M_Templates {
233 233 tokens := omit,
234 234 tokenIDs := omit,
235 235 localTokenIDs := omit,
236   - tokenReqIndicator := omit
  236 + tokenRequestIndicator := omit
237 237 };
238 238  
239 239 /**
... ... @@ -358,7 +358,7 @@ module OneM2M_Templates {
358 358 tokens := omit,
359 359 tokenIDs := omit,
360 360 localTokenIDs := omit,
361   - tokenReqIndicator := omit
  361 + tokenRequestIndicator := omit
362 362  
363 363 };
364 364  
... ... @@ -391,11 +391,11 @@ module OneM2M_Templates {
391 391 tokens := *,
392 392 tokenIDs := *,
393 393 localTokenIDs := *,
394   - tokenReqIndicator := *
  394 + tokenRequestIndicator := *
395 395 };
396 396  
397 397 //Added by @Naum
398   - template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIDs := omit,template (omit) XSD.ID p_from := omit, template (omit) XSD.NCName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
  398 + template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIDs := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
399 399 from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
400 400 requestIdentifier := "m_createAe" & f_rnd(1, 1000000),
401 401 resourceType := int2,
... ... @@ -648,7 +648,7 @@ module OneM2M_Templates {
648 648 tokens := omit,
649 649 tokenIDs := omit,
650 650 localTokenIDs := omit,
651   - tokenReqIndicator := omit
  651 + tokenRequestIndicator := omit
652 652  
653 653 };
654 654  
... ... @@ -675,7 +675,7 @@ module OneM2M_Templates {
675 675 tokens := omit,
676 676 tokenIDs := omit,
677 677 localTokenIDs := omit,
678   - tokenReqIndicator := omit
  678 + tokenRequestIndicator := omit
679 679  
680 680 };
681 681  
... ... @@ -709,7 +709,7 @@ module OneM2M_Templates {
709 709 tokens := *,
710 710 tokenIDs := *,
711 711 localTokenIDs := *,
712   - tokenReqIndicator := *
  712 + tokenRequestIndicator := *
713 713 };
714 714  
715 715 /**
... ... @@ -738,7 +738,7 @@ module OneM2M_Templates {
738 738 tokens := *,
739 739 tokenIDs := *,
740 740 localTokenIDs := *,
741   - tokenReqIndicator := *
  741 + tokenRequestIndicator := *
742 742 };
743 743  
744 744 /**
... ... @@ -844,8 +844,9 @@ module OneM2M_Templates {
844 844 template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
845 845 accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
846 846 accessControlOperations := p_allowedOperations,
847   - accessControlContexts_list := omit,
848   - accessControlAuthenticationFlag := omit
  847 + accessControlContexts_list := {},
  848 + accessControlAuthenticationFlag := omit,
  849 + accessControlObjectDetails_list := {}
849 850 }
850 851  
851 852 //added by @Naum
... ... @@ -1012,7 +1013,7 @@ module OneM2M_Templates {
1012 1013 subscriberURI := p_subscriberURI//O
1013 1014 };
1014 1015  
1015   - template (value) EventNotificationCriteria m_eventNotificationCriteria ( in NotificationEventType p_notificationEventType, in EventNotificationCriteria.attribute_list p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
  1016 + 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
1016 1017 createdBefore := omit,
1017 1018 createdAfter := omit,
1018 1019 modifiedSince := omit,
... ... @@ -1024,8 +1025,8 @@ module OneM2M_Templates {
1024 1025 sizeAbove := omit,
1025 1026 sizeBelow := omit,
1026 1027 operationMonitor_list := {},
1027   - attribute_list := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
1028   - notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8 (TS0001)
  1028 + attribute := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
  1029 + notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
1029 1030 missingData := omit
1030 1031 };
1031 1032  
... ... @@ -2033,7 +2034,7 @@ module OneM2M_Templates {
2033 2034 contentStatus := *,
2034 2035 contentOffset := *,
2035 2036 assignedTokenIdentifiers := *,
2036   - tokenReqInfo := *
  2037 + tokenRequestInformation := *
2037 2038 };
2038 2039  
2039 2040 template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
... ... @@ -2048,7 +2049,7 @@ module OneM2M_Templates {
2048 2049 contentStatus := *,
2049 2050 contentOffset := *,
2050 2051 assignedTokenIdentifiers := *,
2051   - tokenReqInfo := *
  2052 + tokenRequestInformation := *
2052 2053 };
2053 2054  
2054 2055 template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
... ... @@ -2063,7 +2064,7 @@ module OneM2M_Templates {
2063 2064 contentStatus := *,
2064 2065 contentOffset := *,
2065 2066 assignedTokenIdentifiers := *,
2066   - tokenReqInfo := *
  2067 + tokenRequestInformation := *
2067 2068 };
2068 2069  
2069 2070 template ResponsePrimitive mw_responsePrimitiveKO := {
... ... @@ -2078,7 +2079,7 @@ module OneM2M_Templates {
2078 2079 contentStatus := *,
2079 2080 contentOffset := *,
2080 2081 assignedTokenIdentifiers := *,
2081   - tokenReqInfo := *
  2082 + tokenRequestInformation := *
2082 2083 };
2083 2084  
2084 2085 group Notify{
... ... @@ -2095,7 +2096,7 @@ module OneM2M_Templates {
2095 2096 contentStatus := omit,
2096 2097 contentOffset := omit,
2097 2098 assignedTokenIdentifiers := omit,
2098   - tokenReqInfo := omit
  2099 + tokenRequestInformation := omit
2099 2100 };
2100 2101  
2101 2102 }
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author ETSI
9 9 * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
10   - * $Id: OneM2M_Types.ttcn 165 2016-11-17 14:52:31Z reinaortega $
  10 + * $Id: OneM2M_Types.ttcn 170 2016-11-21 15:53:54Z reinaortega $
11 11 * @desc Test System module for oneM2M
12 12 *
13 13 */
... ... @@ -19,7 +19,7 @@ import from XSD all;
19 19  
20 20 type record AccessControlPolicy
21 21 {
22   - XSD.NCName resourceName,
  22 + ResourceName resourceName,
23 23 ResourceType resourceType,
24 24 XSD.ID resourceID,
25 25 NhURI parentID,
... ... @@ -51,7 +51,7 @@ with {
51 51  
52 52 type record AccessControlPolicyAnnc
53 53 {
54   - XSD.NCName resourceName,
  54 + ResourceName resourceName,
55 55 ResourceType resourceType,
56 56 XSD.ID resourceID,
57 57 NhURI parentID,
... ... @@ -87,7 +87,7 @@ with {
87 87  
88 88 type record ActiveCmdhPolicy
89 89 {
90   - XSD.NCName resourceName,
  90 + ResourceName resourceName,
91 91 ResourceType resourceType,
92 92 XSD.ID resourceID,
93 93 NhURI parentID,
... ... @@ -115,7 +115,7 @@ with {
115 115  
116 116 type record AE
117 117 {
118   - XSD.NCName resourceName,
  118 + ResourceName resourceName,
119 119 ResourceType resourceType,
120 120 XSD.ID resourceID,
121 121 NhURI parentID,
... ... @@ -171,7 +171,7 @@ with {
171 171  
172 172 type record AEAnnc
173 173 {
174   - XSD.NCName resourceName,
  174 + ResourceName resourceName,
175 175 ResourceType resourceType,
176 176 XSD.ID resourceID,
177 177 NhURI parentID,
... ... @@ -180,8 +180,8 @@ type record AEAnnc
180 180 Labels labels optional,
181 181 AcpType accessControlPolicyIDs,
182 182 Timestamp expirationTime,
183   - ListOfURIs dynamicAuthorizationConsultationIDs optional,
184 183 XSD.AnyURI link,
  184 + ListOfURIs dynamicAuthorizationConsultationIDs optional,
185 185 XSD.String appName optional,
186 186 XSD.String app_ID optional,
187 187 XSD.ID aE_ID optional,
... ... @@ -229,7 +229,7 @@ with {
229 229  
230 230 type record AllJoynApp
231 231 {
232   - XSD.NCName resourceName,
  232 + ResourceName resourceName,
233 233 ResourceType resourceType,
234 234 XSD.ID resourceID,
235 235 NhURI parentID,
... ... @@ -269,7 +269,7 @@ with {
269 269  
270 270 type record AllJoynAppAnnc
271 271 {
272   - XSD.NCName resourceName,
  272 + ResourceName resourceName,
273 273 ResourceType resourceType,
274 274 XSD.ID resourceID,
275 275 NhURI parentID,
... ... @@ -309,7 +309,7 @@ with {
309 309  
310 310 type record AllJoynInterface
311 311 {
312   - XSD.NCName resourceName,
  312 + ResourceName resourceName,
313 313 ResourceType resourceType,
314 314 XSD.ID resourceID,
315 315 NhURI parentID,
... ... @@ -351,7 +351,7 @@ with {
351 351  
352 352 type record AllJoynInterfaceAnnc
353 353 {
354   - XSD.NCName resourceName,
  354 + ResourceName resourceName,
355 355 ResourceType resourceType,
356 356 XSD.ID resourceID,
357 357 NhURI parentID,
... ... @@ -395,7 +395,7 @@ with {
395 395  
396 396 type record AllJoynMethodCall
397 397 {
398   - XSD.NCName resourceName,
  398 + ResourceName resourceName,
399 399 ResourceType resourceType,
400 400 XSD.ID resourceID,
401 401 NhURI parentID,
... ... @@ -436,7 +436,7 @@ with {
436 436  
437 437 type record AllJoynMethodCallAnnc
438 438 {
439   - XSD.NCName resourceName,
  439 + ResourceName resourceName,
440 440 ResourceType resourceType,
441 441 XSD.ID resourceID,
442 442 NhURI parentID,
... ... @@ -473,7 +473,7 @@ with {
473 473  
474 474 type record AllJoynMethod
475 475 {
476   - XSD.NCName resourceName,
  476 + ResourceName resourceName,
477 477 ResourceType resourceType,
478 478 XSD.ID resourceID,
479 479 NhURI parentID,
... ... @@ -512,7 +512,7 @@ with {
512 512  
513 513 type record AllJoynMethodAnnc
514 514 {
515   - XSD.NCName resourceName,
  515 + ResourceName resourceName,
516 516 ResourceType resourceType,
517 517 XSD.ID resourceID,
518 518 NhURI parentID,
... ... @@ -551,7 +551,7 @@ with {
551 551  
552 552 type record AllJoynProperty
553 553 {
554   - XSD.NCName resourceName,
  554 + ResourceName resourceName,
555 555 ResourceType resourceType,
556 556 XSD.ID resourceID,
557 557 NhURI parentID,
... ... @@ -591,7 +591,7 @@ with {
591 591  
592 592 type record AllJoynPropertyAnnc
593 593 {
594   - XSD.NCName resourceName,
  594 + ResourceName resourceName,
595 595 ResourceType resourceType,
596 596 XSD.ID resourceID,
597 597 NhURI parentID,
... ... @@ -628,7 +628,7 @@ with {
628 628  
629 629 type record AllJoynSvcObject
630 630 {
631   - XSD.NCName resourceName,
  631 + ResourceName resourceName,
632 632 ResourceType resourceType,
633 633 XSD.ID resourceID,
634 634 NhURI parentID,
... ... @@ -671,7 +671,7 @@ with {
671 671  
672 672 type record AllJoynSvcObjectAnnc
673 673 {
674   - XSD.NCName resourceName,
  674 + ResourceName resourceName,
675 675 ResourceType resourceType,
676 676 XSD.ID resourceID,
677 677 NhURI parentID,
... ... @@ -714,7 +714,7 @@ with {
714 714  
715 715 type record AreaNwkDeviceInfo
716 716 {
717   - XSD.NCName resourceName,
  717 + ResourceName resourceName,
718 718 ResourceType resourceType,
719 719 XSD.ID resourceID,
720 720 NhURI parentID,
... ... @@ -757,7 +757,7 @@ with {
757 757  
758 758 type record AreaNwkDeviceInfoAnnc
759 759 {
760   - XSD.NCName resourceName,
  760 + ResourceName resourceName,
761 761 ResourceType resourceType,
762 762 XSD.ID resourceID,
763 763 NhURI parentID,
... ... @@ -798,7 +798,7 @@ with {
798 798  
799 799 type record AreaNwkInfo
800 800 {
801   - XSD.NCName resourceName,
  801 + ResourceName resourceName,
802 802 ResourceType resourceType,
803 803 XSD.ID resourceID,
804 804 NhURI parentID,
... ... @@ -836,7 +836,7 @@ with {
836 836  
837 837 type record AreaNwkInfoAnnc
838 838 {
839   - XSD.NCName resourceName,
  839 + ResourceName resourceName,
840 840 ResourceType resourceType,
841 841 XSD.ID resourceID,
842 842 NhURI parentID,
... ... @@ -872,7 +872,7 @@ with {
872 872  
873 873 type record Battery
874 874 {
875   - XSD.NCName resourceName,
  875 + ResourceName resourceName,
876 876 ResourceType resourceType,
877 877 XSD.ID resourceID,
878 878 NhURI parentID,
... ... @@ -910,7 +910,7 @@ with {
910 910  
911 911 type record BatteryAnnc
912 912 {
913   - XSD.NCName resourceName,
  913 + ResourceName resourceName,
914 914 ResourceType resourceType,
915 915 XSD.ID resourceID,
916 916 NhURI parentID,
... ... @@ -946,7 +946,7 @@ with {
946 946  
947 947 type record CmdhBuffer
948 948 {
949   - XSD.NCName resourceName,
  949 + ResourceName resourceName,
950 950 ResourceType resourceType,
951 951 XSD.ID resourceID,
952 952 NhURI parentID,
... ... @@ -976,7 +976,7 @@ with {
976 976  
977 977 type record CmdhDefaults
978 978 {
979   - XSD.NCName resourceName,
  979 + ResourceName resourceName,
980 980 ResourceType resourceType,
981 981 XSD.ID resourceID,
982 982 NhURI parentID,
... ... @@ -1006,7 +1006,7 @@ with {
1006 1006  
1007 1007 type record CmdhDefEcValue
1008 1008 {
1009   - XSD.NCName resourceName,
  1009 + ResourceName resourceName,
1010 1010 ResourceType resourceType,
1011 1011 XSD.ID resourceID,
1012 1012 NhURI parentID,
... ... @@ -1041,7 +1041,7 @@ with {
1041 1041  
1042 1042 type record CmdhEcDefParamValues
1043 1043 {
1044   - XSD.NCName resourceName,
  1044 + ResourceName resourceName,
1045 1045 ResourceType resourceType,
1046 1046 XSD.ID resourceID,
1047 1047 NhURI parentID,
... ... @@ -1076,7 +1076,7 @@ with {
1076 1076  
1077 1077 type record CmdhLimits
1078 1078 {
1079   - XSD.NCName resourceName,
  1079 + ResourceName resourceName,
1080 1080 ResourceType resourceType,
1081 1081 XSD.ID resourceID,
1082 1082 NhURI parentID,
... ... @@ -1123,7 +1123,7 @@ with {
1123 1123  
1124 1124 type record CmdhNetworkAccessRules
1125 1125 {
1126   - XSD.NCName resourceName,
  1126 + ResourceName resourceName,
1127 1127 ResourceType resourceType,
1128 1128 XSD.ID resourceID,
1129 1129 NhURI parentID,
... ... @@ -1154,7 +1154,7 @@ with {
1154 1154  
1155 1155 type record CmdhNwAccessRule
1156 1156 {
1157   - XSD.NCName resourceName,
  1157 + ResourceName resourceName,
1158 1158 ResourceType resourceType,
1159 1159 XSD.ID resourceID,
1160 1160 NhURI parentID,
... ... @@ -1187,7 +1187,7 @@ with {
1187 1187  
1188 1188 type record CmdhPolicy
1189 1189 {
1190   - XSD.NCName resourceName,
  1190 + ResourceName resourceName,
1191 1191 ResourceType resourceType,
1192 1192 XSD.ID resourceID,
1193 1193 NhURI parentID,
... ... @@ -1419,7 +1419,7 @@ with {
1419 1419 };
1420 1420  
1421 1421  
1422   -type XSD.String ContentInfo //(pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))") TODO To verify pattern
  1422 +type XSD.String ContentInfo //FIXME To be fixed (pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))") TODO To verify pattern
1423 1423 with {
1424 1424 variant "name as uncapitalized";
1425 1425 };
... ... @@ -1471,7 +1471,7 @@ with {
1471 1471 };
1472 1472  
1473 1473  
1474   -type XSD.String ScheduleEntry //FIXME To be added (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])*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))*))")
  1474 +type XSD.String ScheduleEntry //FIXME 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])*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))*))")
1475 1475 with {
1476 1476 variant "name as uncapitalized";
1477 1477 };
... ... @@ -1542,6 +1542,12 @@ with {
1542 1542 };
1543 1543  
1544 1544  
  1545 +type XSD.String ResourceName (pattern "[a-zA-Z0-9]([a-zA-Z0-9.\-,_]*)")
  1546 +with {
  1547 + variant "name as uncapitalized";
  1548 +};
  1549 +
  1550 +
1545 1551  
1546 1552  
1547 1553  
... ... @@ -1595,12 +1601,23 @@ type record MetaInformation
1595 1601 XSD.Boolean deliveryAggregation optional,
1596 1602 XSD.String groupRequestIdentifier optional,
1597 1603 FilterCriteria filterCriteria optional,
1598   - DiscResType discoveryResultType optional
  1604 + DiscResType discoveryResultType optional,
  1605 + record length(1 .. infinity) of RoleID roleIDs,
  1606 + XSD.Boolean tokenRequestIndicator optional,
  1607 + record length(1 .. infinity) of DynAuthJWT tokens,
  1608 + record length(1 .. infinity) of TokenID tokenIDs,
  1609 + record length(1 .. infinity) of XSD.NCName localTokenIDs
1599 1610 }
1600 1611 with {
1601 1612 variant "name as uncapitalized";
1602 1613 //variant (deliveryAggregation) "text 'true' as '1'";
1603 1614 //variant (deliveryAggregation) "text 'false' as '0'";
  1615 + variant (roleIDs) "list";
  1616 + //variant (tokenRequestIndicator) "text 'true' as '1'";
  1617 + //variant (tokenRequestIndicator) "text 'false' as '0'";
  1618 + variant (tokens) "list";
  1619 + variant (tokenIDs) "list";
  1620 + variant (localTokenIDs) "list";
1604 1621 };
1605 1622  
1606 1623  
... ... @@ -1624,8 +1641,6 @@ with {
1624 1641 };
1625 1642  
1626 1643  
1627   -
1628   -
1629 1644 type record FilterCriteria
1630 1645 {
1631 1646 Timestamp createdBefore optional,
... ... @@ -1858,7 +1873,7 @@ with {
1858 1873  
1859 1874 type record MgmtLinkRef
1860 1875 {
1861   - XSD.NCName name,
  1876 + ResourceName name,
1862 1877 MgmtDefinition type_,
1863 1878 XSD.AnyURI base
1864 1879 }
... ... @@ -1891,16 +1906,21 @@ type record AccessControlRule
1891 1906 record of record {
1892 1907 record of ScheduleEntry accessControlWindow_list,
1893 1908 record {
1894   - record length(1 .. infinity) of Ipv4 ipv4Addresses,
1895   - record length(1 .. infinity) of Ipv6 ipv6Addresses
  1909 + record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//FIXME It must be optional
  1910 + record length(1 .. infinity) of Ipv6 ipv6Addresses optional//FIXME It must be optional
1896 1911 } accessControlIpAddresses optional,
1897 1912 LocationRegion accessControlLocationRegion optional
1898   - } accessControlContexts_list optional,
1899   - XSD.Boolean accessControlAuthenticationFlag optional
  1913 + } accessControlContexts_list,
  1914 + XSD.Boolean accessControlAuthenticationFlag optional,
  1915 + record of record {
  1916 + ResourceType resourceType optional,
  1917 + XSD.AnyURI specializationID optional,
  1918 + record length(1 .. infinity) of ResourceType childResourceType
  1919 + } accessControlObjectDetails_list
1900 1920 }
1901 1921 with {
1902 1922 variant "name as uncapitalized";
1903   - //variant (accessControlContexts_list) "untagged";
  1923 + variant (accessControlContexts_list) "untagged";
1904 1924 variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
1905 1925 variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
1906 1926 variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
... ... @@ -1908,12 +1928,15 @@ with {
1908 1928 variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
1909 1929 //variant (accessControlAuthenticationFlag) "text 'true' as '1'";
1910 1930 //variant (accessControlAuthenticationFlag) "text 'false' as '0'";
  1931 + variant (accessControlObjectDetails_list) "untagged";
  1932 + variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
  1933 + variant (accessControlObjectDetails_list[-].childResourceType) "list";
1911 1934 };
1912 1935  
1913 1936  
1914 1937 type record ChildResourceRef
1915 1938 {
1916   - XSD.NCName name,
  1939 + ResourceName name,
1917 1940 XSD.AnyURI specializationID optional,
1918 1941 ResourceType type_,
1919 1942 XSD.AnyURI base
... ... @@ -2232,7 +2255,7 @@ with {
2232 2255  
2233 2256 type record Resource_1
2234 2257 {
2235   - XSD.NCName resourceName,
  2258 + ResourceName resourceName,
2236 2259 ResourceType resourceType,
2237 2260 XSD.ID resourceID,
2238 2261 NhURI parentID,
... ... @@ -2248,7 +2271,7 @@ with {
2248 2271  
2249 2272 type record RegularResource
2250 2273 {
2251   - XSD.NCName resourceName,
  2274 + ResourceName resourceName,
2252 2275 ResourceType resourceType,
2253 2276 XSD.ID resourceID,
2254 2277 NhURI parentID,
... ... @@ -2267,7 +2290,7 @@ with {
2267 2290  
2268 2291 type record AnnounceableResource
2269 2292 {
2270   - XSD.NCName resourceName,
  2293 + ResourceName resourceName,
2271 2294 ResourceType resourceType,
2272 2295 XSD.ID resourceID,
2273 2296 NhURI parentID,
... ... @@ -2289,7 +2312,7 @@ with {
2289 2312  
2290 2313 type record AnnouncedResource
2291 2314 {
2292   - XSD.NCName resourceName,
  2315 + ResourceName resourceName,
2293 2316 ResourceType resourceType,
2294 2317 XSD.ID resourceID,
2295 2318 NhURI parentID,
... ... @@ -2309,7 +2332,7 @@ with {
2309 2332  
2310 2333 type record AnnounceableSubordinateResource
2311 2334 {
2312   - XSD.NCName resourceName,
  2335 + ResourceName resourceName,
2313 2336 ResourceType resourceType,
2314 2337 XSD.ID resourceID,
2315 2338 NhURI parentID,
... ... @@ -2329,7 +2352,7 @@ with {
2329 2352  
2330 2353 type record SubordinateResource
2331 2354 {
2332   - XSD.NCName resourceName,
  2355 + ResourceName resourceName,
2333 2356 ResourceType resourceType,
2334 2357 XSD.ID resourceID,
2335 2358 NhURI parentID,
... ... @@ -2346,7 +2369,7 @@ with {
2346 2369  
2347 2370 type record AnnouncedSubordinateResource
2348 2371 {
2349   - XSD.NCName resourceName,
  2372 + ResourceName resourceName,
2350 2373 ResourceType resourceType,
2351 2374 XSD.ID resourceID,
2352 2375 NhURI parentID,
... ... @@ -2364,7 +2387,7 @@ with {
2364 2387  
2365 2388 type record MgmtResource
2366 2389 {
2367   - XSD.NCName resourceName,
  2390 + ResourceName resourceName,
2368 2391 ResourceType resourceType,
2369 2392 XSD.ID resourceID,
2370 2393 NhURI parentID,
... ... @@ -2390,7 +2413,7 @@ with {
2390 2413  
2391 2414 type record AnnouncedMgmtResource
2392 2415 {
2393   - XSD.NCName resourceName,
  2416 + ResourceName resourceName,
2394 2417 ResourceType resourceType,
2395 2418 XSD.ID resourceID,
2396 2419 NhURI parentID,
... ... @@ -2423,7 +2446,7 @@ with {
2423 2446  
2424 2447 type record FlexContainerResource
2425 2448 {
2426   - XSD.NCName resourceName,
  2449 + ResourceName resourceName,
2427 2450 ResourceType resourceType,
2428 2451 XSD.ID resourceID,
2429 2452 NhURI parentID,
... ... @@ -2448,7 +2471,7 @@ with {
2448 2471  
2449 2472 type record AnnouncedFlexContainerResource
2450 2473 {
2451   - XSD.NCName resourceName,
  2474 + ResourceName resourceName,
2452 2475 ResourceType resourceType,
2453 2476 XSD.ID resourceID,
2454 2477 NhURI parentID,
... ... @@ -2692,7 +2715,7 @@ with {
2692 2715  
2693 2716 type record Container
2694 2717 {
2695   - XSD.NCName resourceName,
  2718 + ResourceName resourceName,
2696 2719 ResourceType resourceType,
2697 2720 XSD.ID resourceID,
2698 2721 NhURI parentID,
... ... @@ -2742,7 +2765,7 @@ with {
2742 2765  
2743 2766 type record ContainerAnnc
2744 2767 {
2745   - XSD.NCName resourceName,
  2768 + ResourceName resourceName,
2746 2769 ResourceType resourceType,
2747 2770 XSD.ID resourceID,
2748 2771 NhURI parentID,
... ... @@ -2793,7 +2816,7 @@ with {
2793 2816  
2794 2817 type record ContentInstance
2795 2818 {
2796   - XSD.NCName resourceName,
  2819 + ResourceName resourceName,
2797 2820 ResourceType resourceType,
2798 2821 XSD.ID resourceID,
2799 2822 NhURI parentID,
... ... @@ -2830,7 +2853,7 @@ with {
2830 2853  
2831 2854 type record ContentInstanceAnnc
2832 2855 {
2833   - XSD.NCName resourceName,
  2856 + ResourceName resourceName,
2834 2857 ResourceType resourceType,
2835 2858 XSD.ID resourceID,
2836 2859 NhURI parentID,
... ... @@ -2863,7 +2886,7 @@ with {
2863 2886  
2864 2887 type record CSEBase
2865 2888 {
2866   - XSD.NCName resourceName,
  2889 + ResourceName resourceName,
2867 2890 ResourceType resourceType,
2868 2891 XSD.ID resourceID,
2869 2892 NhURI parentID,
... ... @@ -2920,7 +2943,7 @@ with {
2920 2943  
2921 2944 type record Delivery
2922 2945 {
2923   - XSD.NCName resourceName,
  2946 + ResourceName resourceName,
2924 2947 ResourceType resourceType,
2925 2948 XSD.ID resourceID,
2926 2949 NhURI parentID,
... ... @@ -2958,7 +2981,7 @@ with {
2958 2981  
2959 2982 type record DeviceCapability
2960 2983 {
2961   - XSD.NCName resourceName,
  2984 + ResourceName resourceName,
2962 2985 ResourceType resourceType,
2963 2986 XSD.ID resourceID,
2964 2987 NhURI parentID,
... ... @@ -3008,7 +3031,7 @@ with {
3008 3031  
3009 3032 type record DeviceCapabilityAnnc
3010 3033 {
3011   - XSD.NCName resourceName,
  3034 + ResourceName resourceName,
3012 3035 ResourceType resourceType,
3013 3036 XSD.ID resourceID,
3014 3037 NhURI parentID,
... ... @@ -3056,7 +3079,7 @@ with {
3056 3079  
3057 3080 type record DeviceInfo
3058 3081 {
3059   - XSD.NCName resourceName,
  3082 + ResourceName resourceName,
3060 3083 ResourceType resourceType,
3061 3084 XSD.ID resourceID,
3062 3085 NhURI parentID,
... ... @@ -3099,7 +3122,7 @@ with {
3099 3122  
3100 3123 type record DeviceInfoAnnc
3101 3124 {
3102   - XSD.NCName resourceName,
  3125 + ResourceName resourceName,
3103 3126 ResourceType resourceType,
3104 3127 XSD.ID resourceID,
3105 3128 NhURI parentID,
... ... @@ -3140,7 +3163,7 @@ with {
3140 3163  
3141 3164 type record DynamicAuthorizationConsultation
3142 3165 {
3143   - XSD.NCName resourceName,
  3166 + ResourceName resourceName,
3144 3167 ResourceType resourceType,
3145 3168 XSD.ID resourceID,
3146 3169 NhURI parentID,
... ... @@ -3507,6 +3530,7 @@ with {
3507 3530  
3508 3531 type enumerated ExecResultType
3509 3532 {
  3533 + int0(0),
3510 3534 int1(1),
3511 3535 int2(2),
3512 3536 int3(3),
... ... @@ -3534,7 +3558,8 @@ type enumerated ExecResultType
3534 3558 int27(27),
3535 3559 int28(28),
3536 3560 int29(29),
3537   - int30(30)
  3561 + int30(30),
  3562 + int31(31)
3538 3563 }
3539 3564 with {
3540 3565 variant "useNumber";
... ... @@ -3958,7 +3983,7 @@ with {
3958 3983  
3959 3984 type record EventConfig
3960 3985 {
3961   - XSD.NCName resourceName,
  3986 + ResourceName resourceName,
3962 3987 ResourceType resourceType,
3963 3988 XSD.ID resourceID,
3964 3989 NhURI parentID,
... ... @@ -3995,7 +4020,7 @@ with {
3995 4020  
3996 4021 type record EventLog
3997 4022 {
3998   - XSD.NCName resourceName,
  4023 + ResourceName resourceName,
3999 4024 ResourceType resourceType,
4000 4025 XSD.ID resourceID,
4001 4026 NhURI parentID,
... ... @@ -4040,7 +4065,7 @@ with {
4040 4065  
4041 4066 type record EventLogAnnc
4042 4067 {
4043   - XSD.NCName resourceName,
  4068 + ResourceName resourceName,
4044 4069 ResourceType resourceType,
4045 4070 XSD.ID resourceID,
4046 4071 NhURI parentID,
... ... @@ -4083,7 +4108,7 @@ with {
4083 4108  
4084 4109 type record ExecInstance
4085 4110 {
4086   - XSD.NCName resourceName,
  4111 + ResourceName resourceName,
4087 4112 ResourceType resourceType,
4088 4113 XSD.ID resourceID,
4089 4114 NhURI parentID,
... ... @@ -4123,7 +4148,7 @@ with {
4123 4148  
4124 4149 type record Firmware
4125 4150 {
4126   - XSD.NCName resourceName,
  4151 + ResourceName resourceName,
4127 4152 ResourceType resourceType,
4128 4153 XSD.ID resourceID,
4129 4154 NhURI parentID,
... ... @@ -4167,7 +4192,7 @@ with {
4167 4192  
4168 4193 type record FirmwareAnnc
4169 4194 {
4170   - XSD.NCName resourceName,
  4195 + ResourceName resourceName,
4171 4196 ResourceType resourceType,
4172 4197 XSD.ID resourceID,
4173 4198 NhURI parentID,
... ... @@ -4209,7 +4234,7 @@ with {
4209 4234  
4210 4235 type record GenericInterworkingOperationInstance
4211 4236 {
4212   - XSD.NCName resourceName,
  4237 + ResourceName resourceName,
4213 4238 ResourceType resourceType,
4214 4239 XSD.ID resourceID,
4215 4240 NhURI parentID,
... ... @@ -4253,7 +4278,7 @@ with {
4253 4278  
4254 4279 type record GenericInterworkingOperationInstanceAnnc
4255 4280 {
4256   - XSD.NCName resourceName,
  4281 + ResourceName resourceName,
4257 4282 ResourceType resourceType,
4258 4283 XSD.ID resourceID,
4259 4284 NhURI parentID,
... ... @@ -4296,7 +4321,7 @@ with {
4296 4321  
4297 4322 type record GenericInterworkingService
4298 4323 {
4299   - XSD.NCName resourceName,
  4324 + ResourceName resourceName,
4300 4325 ResourceType resourceType,
4301 4326 XSD.ID resourceID,
4302 4327 NhURI parentID,
... ... @@ -4313,8 +4338,8 @@ type record GenericInterworkingService
4313 4338 XSD.AnyURI containerDefinition,
4314 4339 XSD.AnyURI ontologyRef optional,
4315 4340 XSD.String serviceName,
4316   - XSD.ID inputDataPointLinks optional,
4317   - PoaList outputDataPointLinks optional,
  4341 + ListOfDataLinks inputDataPointLinks optional,
  4342 + ListOfDataLinks outputDataPointLinks optional,
4318 4343 union {
4319 4344 record length(1 .. infinity) of ChildResourceRef childResource_list,
4320 4345 record of union {
... ... @@ -4339,7 +4364,7 @@ with {
4339 4364  
4340 4365 type record GenericInterworkingServiceAnnc
4341 4366 {
4342   - XSD.NCName resourceName,
  4367 + ResourceName resourceName,
4343 4368 ResourceType resourceType,
4344 4369 XSD.ID resourceID,
4345 4370 NhURI parentID,
... ... @@ -4353,7 +4378,7 @@ type record GenericInterworkingServiceAnnc
4353 4378 XSD.NonNegativeInteger stateTag optional,
4354 4379 XSD.AnyURI containerDefinition,
4355 4380 XSD.AnyURI ontologyRef optional,
4356   - XSD.String serviceName optional,
  4381 + XSD.String serviceName,
4357 4382 ListOfDataLinks inputDataPointLinks optional,
4358 4383 ListOfDataLinks outputDataPointLinks optional,
4359 4384 union {
... ... @@ -4381,7 +4406,7 @@ with {
4381 4406  
4382 4407 type record Group
4383 4408 {
4384   - XSD.NCName resourceName,
  4409 + ResourceName resourceName,
4385 4410 ResourceType resourceType,
4386 4411 XSD.ID resourceID,
4387 4412 NhURI parentID,
... ... @@ -4399,7 +4424,7 @@ type record Group
4399 4424 XSD.PositiveInteger maxNrOfMembers,
4400 4425 ListOfURIs memberIDs,
4401 4426 ListOfURIs membersAccessControlPolicyIDs optional,
4402   - XSD.Boolean memberTypeValidated,
  4427 + XSD.Boolean memberTypeValidated optional,
4403 4428 ConsistencyStrategy consistencyStrategy optional,
4404 4429 XSD.String groupName optional,
4405 4430 union {
... ... @@ -4427,7 +4452,7 @@ with {
4427 4452  
4428 4453 type record GroupAnnc
4429 4454 {
4430   - XSD.NCName resourceName,
  4455 + ResourceName resourceName,
4431 4456 ResourceType resourceType,
4432 4457 XSD.ID resourceID,
4433 4458 NhURI parentID,
... ... @@ -4472,7 +4497,7 @@ with {
4472 4497  
4473 4498 type record LocationPolicy
4474 4499 {
4475   - XSD.NCName resourceName,
  4500 + ResourceName resourceName,
4476 4501 ResourceType resourceType,
4477 4502 XSD.ID resourceID,
4478 4503 NhURI parentID,
... ... @@ -4513,7 +4538,7 @@ with {
4513 4538  
4514 4539 type record LocationPolicyAnnc
4515 4540 {
4516   - XSD.NCName resourceName,
  4541 + ResourceName resourceName,
4517 4542 ResourceType resourceType,
4518 4543 XSD.ID resourceID,
4519 4544 NhURI parentID,
... ... @@ -4541,7 +4566,7 @@ with {
4541 4566  
4542 4567 type record M2mServiceSubscriptionProfile
4543 4568 {
4544   - XSD.NCName resourceName,
  4569 + ResourceName resourceName,
4545 4570 ResourceType resourceType,
4546 4571 XSD.ID resourceID,
4547 4572 NhURI parentID,
... ... @@ -4573,7 +4598,7 @@ with {
4573 4598  
4574 4599 type record Memory
4575 4600 {
4576   - XSD.NCName resourceName,
  4601 + ResourceName resourceName,
4577 4602 ResourceType resourceType,
4578 4603 XSD.ID resourceID,
4579 4604 NhURI parentID,
... ... @@ -4611,7 +4636,7 @@ with {
4611 4636  
4612 4637 type record MemoryAnnc
4613 4638 {
4614   - XSD.NCName resourceName,
  4639 + ResourceName resourceName,
4615 4640 ResourceType resourceType,
4616 4641 XSD.ID resourceID,
4617 4642 NhURI parentID,
... ... @@ -4647,7 +4672,7 @@ with {
4647 4672  
4648 4673 type record MgmtCmd
4649 4674 {
4650   - XSD.NCName resourceName,
  4675 + ResourceName resourceName,
4651 4676 ResourceType resourceType,
4652 4677 XSD.ID resourceID,
4653 4678 NhURI parentID,
... ... @@ -4690,7 +4715,7 @@ with {
4690 4715  
4691 4716 type record Node
4692 4717 {
4693   - XSD.NCName resourceName,
  4718 + ResourceName resourceName,
4694 4719 ResourceType resourceType,
4695 4720 XSD.ID resourceID,
4696 4721 NhURI parentID,
... ... @@ -4740,7 +4765,7 @@ with {
4740 4765  
4741 4766 type record NodeAnnc
4742 4767 {
4743   - XSD.NCName resourceName,
  4768 + ResourceName resourceName,
4744 4769 ResourceType resourceType,
4745 4770 XSD.ID resourceID,
4746 4771 NhURI parentID,
... ... @@ -4787,7 +4812,7 @@ with {
4787 4812  
4788 4813 type record NotificationTargetMgmtPolicyRef
4789 4814 {
4790   - XSD.NCName resourceName,
  4815 + ResourceName resourceName,
4791 4816 ResourceType resourceType,
4792 4817 XSD.ID resourceID,
4793 4818 NhURI parentID,
... ... @@ -4818,7 +4843,7 @@ with {
4818 4843  
4819 4844 type record NotificationTargetPolicy
4820 4845 {
4821   - XSD.NCName resourceName,
  4846 + ResourceName resourceName,
4822 4847 ResourceType resourceType,
4823 4848 XSD.ID resourceID,
4824 4849 NhURI parentID,
... ... @@ -4877,6 +4902,7 @@ with {
4877 4902 variant (notification_list[-]) "name as 'notification'";
4878 4903 };
4879 4904  
  4905 +//FIXME To be added
4880 4906 type union Representation {
4881 4907 anytype resource,
4882 4908 ResponsePrimitive responsePrimitive
... ... @@ -4885,7 +4911,7 @@ type union Representation {
4885 4911 type record Notification_1
4886 4912 {
4887 4913 record {
4888   - //XSD.AnyType representation optional,
  4914 + //XSD.AnyType representation optional, To be exchanged by Representation
4889 4915 Representation representation optional,
4890 4916 record {
4891 4917 Operation operation optional,
... ... @@ -4955,7 +4981,7 @@ type record DynAuthDasResponse
4955 4981 SetOfAcrs grantedPrivileges optional,
4956 4982 AbsRelTimestamp privilegesLifetime optional
4957 4983 } dynamicACPInfo optional,
4958   - record length(1 .. infinity) of DynAuthJWT tokens optional//it must be optional
  4984 + record length(1 .. infinity) of DynAuthJWT tokens
4959 4985 }
4960 4986 with {
4961 4987 variant "name as uncapitalized";
... ... @@ -4965,7 +4991,7 @@ with {
4965 4991  
4966 4992 type record PolicyDeletionRules
4967 4993 {
4968   - XSD.NCName resourceName,
  4994 + ResourceName resourceName,
4969 4995 ResourceType resourceType,
4970 4996 XSD.ID resourceID,
4971 4997 NhURI parentID,
... ... @@ -4996,7 +5022,7 @@ with {
4996 5022  
4997 5023 type record PollingChannel
4998 5024 {
4999   - XSD.NCName resourceName,
  5025 + ResourceName resourceName,
5000 5026 ResourceType resourceType,
5001 5027 XSD.ID resourceID,
5002 5028 NhURI parentID,
... ... @@ -5014,7 +5040,7 @@ with {
5014 5040  
5015 5041 type record Reboot
5016 5042 {
5017   - XSD.NCName resourceName,
  5043 + ResourceName resourceName,
5018 5044 ResourceType resourceType,
5019 5045 XSD.ID resourceID,
5020 5046 NhURI parentID,
... ... @@ -5056,7 +5082,7 @@ with {
5056 5082  
5057 5083 type record RebootAnnc
5058 5084 {
5059   - XSD.NCName resourceName,
  5085 + ResourceName resourceName,
5060 5086 ResourceType resourceType,
5061 5087 XSD.ID resourceID,
5062 5088 NhURI parentID,
... ... @@ -5096,7 +5122,7 @@ with {
5096 5122  
5097 5123 type record RemoteCSE
5098 5124 {
5099   - XSD.NCName resourceName,
  5125 + ResourceName resourceName,
5100 5126 ResourceType resourceType,
5101 5127 XSD.ID resourceID,
5102 5128 NhURI parentID,
... ... @@ -5163,7 +5189,7 @@ with {
5163 5189  
5164 5190 type record RemoteCSEAnnc
5165 5191 {
5166   - XSD.NCName resourceName,
  5192 + ResourceName resourceName,
5167 5193 ResourceType resourceType,
5168 5194 XSD.ID resourceID,
5169 5195 NhURI parentID,
... ... @@ -5242,10 +5268,10 @@ type record RequestPrimitive
5242 5268 XSD.String groupRequestIdentifier optional,
5243 5269 FilterCriteria filterCriteria optional,
5244 5270 DiscResType discoveryResultType optional,
5245   - DynAuthJWT tokens optional,
5246   - TokenID tokenIDs optional,
5247   - record length(1 .. infinity) of XSD.NCName localTokenIDs optional, //TODO it must be optional
5248   - XSD.Boolean tokenReqIndicator optional
  5271 + record length(1 .. infinity) of DynAuthJWT tokens optional,//TODO it must be optional
  5272 + record length(1 .. infinity) of TokenID tokenIDs optional,//TODO it must be optional
  5273 + record length(1 .. infinity) of XSD.NCName localTokenIDs optional,//TODO it must be optional
  5274 + XSD.Boolean tokenRequestIndicator optional
5249 5275 }
5250 5276 with {
5251 5277 variant "name as uncapitalized";
... ... @@ -5255,9 +5281,11 @@ with {
5255 5281 variant (roleIDs) "list";
5256 5282 //variant (deliveryAggregation) "text 'true' as '1'";
5257 5283 //variant (deliveryAggregation) "text 'false' as '0'";
  5284 + variant (tokens) "list";
  5285 + variant (tokenIDs) "list";
5258 5286 variant (localTokenIDs) "list";
5259   - //variant (tokenReqIndicator) "text 'true' as '1'";
5260   - //variant (tokenReqIndicator) "text 'false' as '0'";
  5287 + //variant (tokenRequestIndicator) "text 'true' as '1'";
  5288 + //variant (tokenRequestIndicator) "text 'false' as '0'";
5261 5289 };
5262 5290  
5263 5291  
... ... @@ -5270,7 +5298,7 @@ with {
5270 5298  
5271 5299 type record Request
5272 5300 {
5273   - XSD.NCName resourceName,
  5301 + ResourceName resourceName,
5274 5302 ResourceType resourceType,
5275 5303 XSD.ID resourceID,
5276 5304 NhURI parentID,
... ... @@ -5321,7 +5349,7 @@ type record ResponsePrimitive
5321 5349 ContentStatus contentStatus optional,
5322 5350 XSD.PositiveInteger contentOffset optional,
5323 5351 DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
5324   - DynAuthTokenReqInfo tokenReqInfo optional
  5352 + DynAuthTokenReqInfo tokenRequestInformation optional
5325 5353 }
5326 5354 with {
5327 5355 variant "name as uncapitalized";
... ... @@ -5420,7 +5448,7 @@ with {
5420 5448  
5421 5449 type record Role
5422 5450 {
5423   - XSD.NCName resourceName,
  5451 + ResourceName resourceName,
5424 5452 ResourceType resourceType,
5425 5453 XSD.ID resourceID,
5426 5454 NhURI parentID,
... ... @@ -5458,7 +5486,7 @@ with {
5458 5486  
5459 5487 type record Schedule
5460 5488 {
5461   - XSD.NCName resourceName,
  5489 + ResourceName resourceName,
5462 5490 ResourceType resourceType,
5463 5491 XSD.ID resourceID,
5464 5492 NhURI parentID,
... ... @@ -5491,7 +5519,7 @@ with {
5491 5519  
5492 5520 type record ScheduleAnnc
5493 5521 {
5494   - XSD.NCName resourceName,
  5522 + ResourceName resourceName,
5495 5523 ResourceType resourceType,
5496 5524 XSD.ID resourceID,
5497 5525 NhURI parentID,
... ... @@ -5511,7 +5539,7 @@ with {
5511 5539  
5512 5540 type record SemanticDescriptor
5513 5541 {
5514   - XSD.NCName resourceName,
  5542 + ResourceName resourceName,
5515 5543 ResourceType resourceType,
5516 5544 XSD.ID resourceID,
5517 5545 NhURI parentID,
... ... @@ -5549,7 +5577,7 @@ with {
5549 5577  
5550 5578 type record SemanticDescriptorAnnc
5551 5579 {
5552   - XSD.NCName resourceName,
  5580 + ResourceName resourceName,
5553 5581 ResourceType resourceType,
5554 5582 XSD.ID resourceID,
5555 5583 NhURI parentID,
... ... @@ -5584,7 +5612,7 @@ with {
5584 5612  
5585 5613 type record ServiceSubscribedAppRule
5586 5614 {
5587   - XSD.NCName resourceName,
  5615 + ResourceName resourceName,
5588 5616 ResourceType resourceType,
5589 5617 XSD.ID resourceID,
5590 5618 NhURI parentID,
... ... @@ -5597,6 +5625,7 @@ type record ServiceSubscribedAppRule
5597 5625 ListOfM2MID applicableCredIDs optional,
5598 5626 ListOfM2MID allowedApp_IDs optional,
5599 5627 ListOfM2MID allowedAEs optional,
  5628 + record length(1 .. infinity) of RoleID allowedRole_IDs,
5600 5629 union {
5601 5630 record length(1 .. infinity) of ChildResourceRef childResource_list,
5602 5631 record length(1 .. infinity) of Subscription subscription_list
... ... @@ -5607,6 +5636,8 @@ with {
5607 5636 variant "element";
5608 5637 variant (resourceName) "attribute";
5609 5638 variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
  5639 + variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
  5640 + variant (allowedRole_IDs) "list";
5610 5641 variant (choice) "untagged";
5611 5642 variant (choice.childResource_list) "untagged";
5612 5643 variant (choice.childResource_list[-]) "name as 'childResource'";
... ... @@ -5617,7 +5648,7 @@ with {
5617 5648  
5618 5649 type record ServiceSubscribedNode
5619 5650 {
5620   - XSD.NCName resourceName,
  5651 + ResourceName resourceName,
5621 5652 ResourceType resourceType,
5622 5653 XSD.ID resourceID,
5623 5654 NhURI parentID,
... ... @@ -5652,7 +5683,7 @@ with {
5652 5683  
5653 5684 type record Software
5654 5685 {
5655   - XSD.NCName resourceName,
  5686 + ResourceName resourceName,
5656 5687 ResourceType resourceType,
5657 5688 XSD.ID resourceID,
5658 5689 NhURI parentID,
... ... @@ -5708,7 +5739,7 @@ with {
5708 5739  
5709 5740 type record SoftwareAnnc
5710 5741 {
5711   - XSD.NCName resourceName,
  5742 + ResourceName resourceName,
5712 5743 ResourceType resourceType,
5713 5744 XSD.ID resourceID,
5714 5745 NhURI parentID,
... ... @@ -5762,7 +5793,7 @@ with {
5762 5793  
5763 5794 type record StatsCollect
5764 5795 {
5765   - XSD.NCName resourceName,
  5796 + ResourceName resourceName,
5766 5797 ResourceType resourceType,
5767 5798 XSD.ID resourceID,
5768 5799 NhURI parentID,
... ... @@ -5799,7 +5830,7 @@ with {
5799 5830  
5800 5831 type record StatsConfig
5801 5832 {
5802   - XSD.NCName resourceName,
  5833 + ResourceName resourceName,
5803 5834 ResourceType resourceType,
5804 5835 XSD.ID resourceID,
5805 5836 NhURI parentID,
... ... @@ -5832,7 +5863,7 @@ with {
5832 5863  
5833 5864 type record Subscription
5834 5865 {
5835   - XSD.NCName resourceName,
  5866 + ResourceName resourceName,
5836 5867 ResourceType resourceType,
5837 5868 XSD.ID resourceID,
5838 5869 NhURI parentID,
... ... @@ -5892,7 +5923,7 @@ type record EventNotificationCriteria
5892 5923 XSD.NonNegativeInteger sizeAbove optional,
5893 5924 XSD.PositiveInteger sizeBelow optional,
5894 5925 record length(0 .. 5) of Operation operationMonitor_list,
5895   - record of Attribute attribute_list,
  5926 + AttributeList_1 attribute optional,
5896 5927 record length(0 .. 5) of NotificationEventType notificationEventType_list,
5897 5928 MissingData missingData optional
5898 5929 }
... ... @@ -5900,8 +5931,6 @@ with {
5900 5931 variant "name as uncapitalized";
5901 5932 variant (operationMonitor_list) "untagged";
5902 5933 variant (operationMonitor_list[-]) "name as 'operationMonitor'";
5903   - variant (attribute_list) "untagged";
5904   - variant (attribute_list[-]) "name as 'attribute'";
5905 5934 variant (notificationEventType_list) "untagged";
5906 5935 variant (notificationEventType_list[-]) "name as 'notificationEventType'";
5907 5936 };
... ... @@ -5929,7 +5958,7 @@ with {
5929 5958  
5930 5959 type record SvcFwWrapper
5931 5960 {
5932   - XSD.NCName resourceName,
  5961 + ResourceName resourceName,
5933 5962 ResourceType resourceType,
5934 5963 XSD.ID resourceID,
5935 5964 NhURI parentID,
... ... @@ -5967,7 +5996,7 @@ with {
5967 5996  
5968 5997 type record SvcFwWrapperAnnc
5969 5998 {
5970   - XSD.NCName resourceName,
  5999 + ResourceName resourceName,
5971 6000 ResourceType resourceType,
5972 6001 XSD.ID resourceID,
5973 6002 NhURI parentID,
... ... @@ -6004,7 +6033,7 @@ with {
6004 6033  
6005 6034 type record SvcObjWrapper
6006 6035 {
6007   - XSD.NCName resourceName,
  6036 + ResourceName resourceName,
6008 6037 ResourceType resourceType,
6009 6038 XSD.ID resourceID,
6010 6039 NhURI parentID,
... ... @@ -6043,7 +6072,7 @@ with {
6043 6072  
6044 6073 type record SvcObjWrapperAnnc
6045 6074 {
6046   - XSD.NCName resourceName,
  6075 + ResourceName resourceName,
6047 6076 ResourceType resourceType,
6048 6077 XSD.ID resourceID,
6049 6078 NhURI parentID,
... ... @@ -6081,7 +6110,7 @@ with {
6081 6110  
6082 6111 type record TimeSeriesInstance
6083 6112 {
6084   - XSD.NCName resourceName,
  6113 + ResourceName resourceName,
6085 6114 ResourceType resourceType,
6086 6115 XSD.ID resourceID,
6087 6116 NhURI parentID,
... ... @@ -6105,7 +6134,7 @@ with {
6105 6134  
6106 6135 type record TimeSeriesInstanceAnnc
6107 6136 {
6108   - XSD.NCName resourceName,
  6137 + ResourceName resourceName,
6109 6138 ResourceType resourceType,
6110 6139 XSD.ID resourceID,
6111 6140 NhURI parentID,
... ... @@ -6127,7 +6156,7 @@ with {
6127 6156  
6128 6157 type record TimeSeries
6129 6158 {
6130   - XSD.NCName resourceName,
  6159 + ResourceName resourceName,
6131 6160 ResourceType resourceType,
6132 6161 XSD.ID resourceID,
6133 6162 NhURI parentID,
... ... @@ -6181,7 +6210,7 @@ with {
6181 6210  
6182 6211 type record TimeSeriesAnnc
6183 6212 {
6184   - XSD.NCName resourceName,
  6213 + ResourceName resourceName,
6185 6214 ResourceType resourceType,
6186 6215 XSD.ID resourceID,
6187 6216 NhURI parentID,
... ... @@ -6231,7 +6260,7 @@ with {
6231 6260  
6232 6261 type record Token
6233 6262 {
6234   - XSD.NCName resourceName,
  6263 + ResourceName resourceName,
6235 6264 ResourceType resourceType,
6236 6265 XSD.ID resourceID,
6237 6266 NhURI parentID,
... ... @@ -6276,7 +6305,7 @@ with {
6276 6305  
6277 6306 type record TrafficPattern
6278 6307 {
6279   - XSD.NCName resourceName,
  6308 + ResourceName resourceName,
6280 6309 ResourceType resourceType,
6281 6310 XSD.ID resourceID,
6282 6311 NhURI parentID,
... ... @@ -6325,7 +6354,7 @@ with {
6325 6354  
6326 6355 type record TrafficPatternAnnc
6327 6356 {
6328   - XSD.NCName resourceName,
  6357 + ResourceName resourceName,
6329 6358 ResourceType resourceType,
6330 6359 XSD.ID resourceID,
6331 6360 NhURI parentID,
... ... @@ -7081,4 +7110,3 @@ with {
7081 7110 variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
7082 7111 extension "anytype Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid"
7083 7112 }
7084   -
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author ETSI
9 9 * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
10   - * $Id: OneM2M_Testcases.ttcn 169 2016-11-21 09:45:43Z reinaortega $
  10 + * $Id: OneM2M_Testcases.ttcn 170 2016-11-21 15:53:54Z reinaortega $
11 11 * @desc Module containing test cases for oneM2M
12 12 *
13 13 */
... ... @@ -22,7 +22,7 @@ module OneM2M_Testcases {
22 22 import from OneM2M_Pixits all;
23 23 import from OneM2M_Pics all;
24 24 import from OneM2M_Functions all;
25   - import from LibCommon_Time {modulepar all};
  25 + import from LibCommon_Time all;
26 26 import from XSD all;
27 27  
28 28  
... ... @@ -1371,7 +1371,7 @@ module OneM2M_Testcases {
1371 1371 // Preamble
1372 1372  
1373 1373 for (i := 0; i<v_sizeResourceTypeList; i := i+1){
1374   - if(match(p_requestPrimitiveList[i].resourceType, int23)){
  1374 + if(match(int23, p_requestPrimitiveList[i].resourceType)){
1375 1375 v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
1376 1376 p_requestPrimitiveList[i].primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)};
1377 1377 p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex)));
... ... @@ -3355,8 +3355,9 @@ module OneM2M_Testcases {
3355 3355 {
3356 3356 accessControlOriginators := {"admin:admin"},
3357 3357 accessControlOperations := int61,
3358   - accessControlContexts_list := omit,
3359   - accessControlAuthenticationFlag := omit
  3358 + accessControlContexts_list := {},
  3359 + accessControlAuthenticationFlag := omit,
  3360 + accessControlObjectDetails_list := {}
3360 3361 }
3361 3362 }
3362 3363 }
... ... @@ -7646,7 +7647,7 @@ module OneM2M_Testcases {
7646 7647  
7647 7648 f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
7648 7649  
7649   - 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)
  7650 + 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)
7650 7651  
7651 7652 v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
7652 7653  
... ... @@ -7713,7 +7714,7 @@ module OneM2M_Testcases {
7713 7714  
7714 7715 f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
7715 7716  
7716   - v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int2));
  7717 + v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -));
7717 7718  
7718 7719 v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
7719 7720  
... ... @@ -7817,7 +7818,7 @@ module OneM2M_Testcases {
7817 7818  
7818 7819 f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
7819 7820  
7820   - v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int4));
  7821 + v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -));
7821 7822  
7822 7823 v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted)
7823 7824  
... ... @@ -8174,7 +8175,7 @@ module OneM2M_Testcases {
8174 8175 // Local variables
8175 8176 var MsgIn v_response;
8176 8177 var Labels v_labels_1:= {"VALUE_1"};
8177   - var Attribute v_attribute := {"labels",{omit,omit,{"VALUE_1"}}};// TODO normaly value isn't expected
  8178 + var AttributeList_1 v_attributeList := {"labels"};
8178 8179 var integer v_aeIndex := -1;
8179 8180 var integer v_resourceIndex := -1;
8180 8181 var template RequestPrimitive v_createRequest := omit;
... ... @@ -8199,7 +8200,7 @@ module OneM2M_Testcases {
8199 8200  
8200 8201 f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
8201 8202  
8202   - v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
  8203 + v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
8203 8204  
8204 8205 v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
8205 8206  
... ... @@ -8246,7 +8247,7 @@ module OneM2M_Testcases {
8246 8247 // Local variables
8247 8248 var MsgIn v_response;
8248 8249 var Labels v_labels_1:= {"VALUE_1"};
8249   - var Attribute v_attribute := {"appName",{omit,omit,{"VALUE_1"}}}; // TODO normaly value isn't expected
  8250 + var AttributeList_1 v_attributeList := {"appName"};
8250 8251 var integer v_aeIndex := -1;
8251 8252 var integer v_resourceIndex := -1;
8252 8253 var template RequestPrimitive v_createRequest := omit;
... ... @@ -8269,7 +8270,7 @@ module OneM2M_Testcases {
8269 8270  
8270 8271 f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
8271 8272  
8272   - v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
  8273 + v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
8273 8274  
8274 8275 v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
8275 8276  
... ...