Commit 2164ace22149cb97cc853b248114d0c291557d1b

Authored by Miguel Angel Reina Ortega
1 parent 5eede623

Moved to XSD v3_9_0

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
Showing 1 changed file with 444 additions and 74 deletions

Too many changes to show.

To preserve performance only 1 of 2 files are displayed.

... ... @@ -124,7 +124,12 @@ module OneM2M_Templates {
124 124 tokenIDs := omit,
125 125 localTokenIDs := omit,
126 126 tokenRequestIndicator := omit,
127   - releaseVersionIndicator := "2a",
  127 + groupRequestTargetMembers := omit,
  128 + authorSignIndicator := omit,
  129 + authorSigns := omit,
  130 + authorRelIndicator := omit,
  131 + semanticQueryIndicator := omit,
  132 + releaseVersionIndicator := "3",
128 133 vendorInformation := omit
129 134 };
130 135  
... ... @@ -144,11 +149,18 @@ module OneM2M_Templates {
144 149 expireBefore := omit,
145 150 expireAfter := omit,
146 151 labels := omit,
  152 + childLabels := omit,
  153 + parentLabels := omit,
  154 + labelsQuery := omit,
147 155 resourceType := p_resourceTypeList,
  156 + childResourceType := omit,
  157 + parentResourceType := omit,
148 158 sizeAbove := omit,
149 159 sizeBelow := omit,
150 160 contentType_list := {},
151 161 attribute_list := {},
  162 + childAttribute_list := {},
  163 + parentAttribute_list := {},
152 164 filterUsage := int1,
153 165 limit := omit,
154 166 semanticsFilter_list := {},
... ... @@ -156,7 +168,8 @@ module OneM2M_Templates {
156 168 contentFilterSyntax := omit,
157 169 contentFilterQuery := omit,
158 170 level := omit,
159   - offset := omit
  171 + offset := omit,
  172 + applyRelativePath := omit
160 173 }
161 174 };
162 175  
... ... @@ -188,6 +201,11 @@ module OneM2M_Templates {
188 201 tokenIDs := *,
189 202 localTokenIDs := *,
190 203 tokenRequestIndicator := *,
  204 + groupRequestTargetMembers := *,
  205 + authorSignIndicator := *,
  206 + authorSigns := *,
  207 + authorRelIndicator := *,
  208 + semanticQueryIndicator := *,
191 209 releaseVersionIndicator := ?,
192 210 vendorInformation := *
193 211 };
... ... @@ -221,7 +239,12 @@ module OneM2M_Templates {
221 239 tokenIDs := omit,
222 240 localTokenIDs := omit,
223 241 tokenRequestIndicator := omit,
224   - releaseVersionIndicator := "2a",
  242 + groupRequestTargetMembers := omit,
  243 + authorSignIndicator := omit,
  244 + authorSigns := omit,
  245 + authorRelIndicator := omit,
  246 + semanticQueryIndicator := omit,
  247 + releaseVersionIndicator := "3",
225 248 vendorInformation := omit
226 249 };
227 250  
... ... @@ -255,7 +278,12 @@ module OneM2M_Templates {
255 278 tokenIDs := omit,
256 279 localTokenIDs := omit,
257 280 tokenRequestIndicator := omit,
258   - releaseVersionIndicator := "2a",
  281 + groupRequestTargetMembers := omit,
  282 + authorSignIndicator := omit,
  283 + authorSigns := omit,
  284 + authorRelIndicator := omit,
  285 + semanticQueryIndicator := omit,
  286 + releaseVersionIndicator := "3",
259 287 vendorInformation := omit
260 288 };
261 289  
... ... @@ -277,19 +305,27 @@ module OneM2M_Templates {
277 305 expireBefore := omit,
278 306 expireAfter := omit,
279 307 labels := omit,
  308 + childLabels := omit,
  309 + parentLabels := omit,
  310 + labelsQuery := omit,
280 311 resourceType := omit,
  312 + childResourceType := omit,
  313 + parentResourceType := omit,
281 314 sizeAbove := omit,
282 315 sizeBelow := omit,
283 316 contentType_list := {},
284 317 attribute_list := {},
285   - filterUsage := p_filterUsage,
  318 + childAttribute_list := {},
  319 + parentAttribute_list := {},
  320 + filterUsage := int1,
286 321 limit := omit,
287 322 semanticsFilter_list := {},
288 323 filterOperation := omit,
289 324 contentFilterSyntax := omit,
290 325 contentFilterQuery := omit,
291 326 level := omit,
292   - offset := omit
  327 + offset := omit,
  328 + applyRelativePath := omit
293 329 }
294 330 };
295 331  
... ... @@ -323,11 +359,18 @@ module OneM2M_Templates {
323 359 expireBefore := omit,
324 360 expireAfter := omit,
325 361 labels := p_labels,
  362 + childLabels := omit,
  363 + parentLabels := omit,
  364 + labelsQuery := omit,
326 365 resourceType := omit,
  366 + childResourceType := omit,
  367 + parentResourceType := omit,
327 368 sizeAbove := omit,
328 369 sizeBelow := omit,
329 370 contentType_list := {},
330 371 attribute_list := {},
  372 + childAttribute_list := {},
  373 + parentAttribute_list := {},
331 374 filterUsage := p_filterUsage,
332 375 limit := omit,
333 376 semanticsFilter_list := {},
... ... @@ -335,7 +378,8 @@ module OneM2M_Templates {
335 378 contentFilterSyntax := omit,
336 379 contentFilterQuery := omit,
337 380 level := omit,
338   - offset := omit
  381 + offset := omit,
  382 + applyRelativePath := omit
339 383 }
340 384 };
341 385 /**
... ... @@ -356,19 +400,27 @@ module OneM2M_Templates {
356 400 expireBefore := omit,
357 401 expireAfter := omit,
358 402 labels := omit,
  403 + childLabels := omit,
  404 + parentLabels := omit,
  405 + labelsQuery := omit,
359 406 resourceType := omit,
  407 + childResourceType := omit,
  408 + parentResourceType := omit,
360 409 sizeAbove := omit,
361 410 sizeBelow := omit,
362 411 contentType_list := {},
363 412 attribute_list := {},
364   - filterUsage := p_filterUsage,
  413 + childAttribute_list := {},
  414 + parentAttribute_list := {},
  415 + filterUsage := p_filterUsage,
365 416 limit := omit,
366 417 semanticsFilter_list := {},
367 418 filterOperation := omit,
368 419 contentFilterSyntax := omit,
369 420 contentFilterQuery := omit,
370 421 level := omit,
371   - offset := omit
  422 + offset := omit,
  423 + applyRelativePath := omit
372 424 },
373 425 discoveryResultType := p_discResType
374 426 };
... ... @@ -391,19 +443,27 @@ module OneM2M_Templates {
391 443 expireBefore := omit,
392 444 expireAfter := omit,
393 445 labels := omit,
  446 + childLabels := omit,
  447 + parentLabels := omit,
  448 + labelsQuery := omit,
394 449 resourceType := omit,
  450 + childResourceType := omit,
  451 + parentResourceType := omit,
395 452 sizeAbove := omit,
396 453 sizeBelow := omit,
397 454 contentType_list := {},
398 455 attribute_list := {},
399   - filterUsage := omit,
  456 + childAttribute_list := {},
  457 + parentAttribute_list := {},
  458 + filterUsage := omit,
400 459 limit := omit,
401 460 semanticsFilter_list := {},
402 461 filterOperation := omit,
403 462 contentFilterSyntax := omit,
404 463 contentFilterQuery := omit,
405 464 level := omit,
406   - offset := omit
  465 + offset := omit,
  466 + applyRelativePath := omit
407 467 }
408 468 };
409 469  
... ... @@ -430,20 +490,27 @@ module OneM2M_Templates {
430 490 expireBefore := omit,
431 491 expireAfter := omit,
432 492 labels := omit,
  493 + childLabels := omit,
  494 + parentLabels := omit,
  495 + labelsQuery := omit,
433 496 resourceType := omit,
  497 + childResourceType := omit,
  498 + parentResourceType := omit,
434 499 sizeAbove := omit,
435 500 sizeBelow := omit,
436 501 contentType_list := {},
437 502 attribute_list := {},
438   - filterUsage := omit,
  503 + childAttribute_list := {},
  504 + parentAttribute_list := {},
  505 + filterUsage := omit,
439 506 limit := omit,
440 507 semanticsFilter_list := {},
441 508 filterOperation := omit,
442 509 contentFilterSyntax := omit,
443 510 contentFilterQuery := omit,
444 511 level := omit,
445   - offset := omit
446   -
  512 + offset := omit,
  513 + applyRelativePath := omit
447 514 }
448 515  
449 516  
... ... @@ -476,7 +543,12 @@ module OneM2M_Templates {
476 543 tokenIDs := omit,
477 544 localTokenIDs := omit,
478 545 tokenRequestIndicator := omit,
479   - releaseVersionIndicator := "2a",
  546 + groupRequestTargetMembers := omit,
  547 + authorSignIndicator := omit,
  548 + authorSigns := omit,
  549 + authorRelIndicator := omit,
  550 + semanticQueryIndicator := omit,
  551 + releaseVersionIndicator := "3",
480 552 vendorInformation := omit
481 553 };
482 554  
... ... @@ -505,6 +577,11 @@ module OneM2M_Templates {
505 577 tokenIDs := *,
506 578 localTokenIDs := *,
507 579 tokenRequestIndicator := *,
  580 + groupRequestTargetMembers := *,
  581 + authorSignIndicator := *,
  582 + authorSigns := *,
  583 + authorRelIndicator := *,
  584 + semanticQueryIndicator := *,
508 585 releaseVersionIndicator := ?,
509 586 vendorInformation := *
510 587 };
... ... @@ -709,7 +786,12 @@ module OneM2M_Templates {
709 786 tokenIDs := omit,
710 787 localTokenIDs := omit,
711 788 tokenRequestIndicator := omit,
712   - releaseVersionIndicator := "2a",
  789 + groupRequestTargetMembers := omit,
  790 + authorSignIndicator := omit,
  791 + authorSigns := omit,
  792 + authorRelIndicator := omit,
  793 + semanticQueryIndicator := omit,
  794 + releaseVersionIndicator := "3",
713 795 vendorInformation := omit
714 796  
715 797 };
... ... @@ -741,6 +823,11 @@ module OneM2M_Templates {
741 823 tokenIDs := *,
742 824 localTokenIDs := *,
743 825 tokenRequestIndicator := *,
  826 + groupRequestTargetMembers := *,
  827 + authorSignIndicator := *,
  828 + authorSigns := *,
  829 + authorRelIndicator := *,
  830 + semanticQueryIndicator := *,
744 831 releaseVersionIndicator := ?,
745 832 vendorInformation := *
746 833 }
... ... @@ -772,6 +859,11 @@ module OneM2M_Templates {
772 859 tokenIDs := *,
773 860 localTokenIDs := *,
774 861 tokenRequestIndicator := *,
  862 + groupRequestTargetMembers := *,
  863 + authorSignIndicator := *,
  864 + authorSigns := *,
  865 + authorRelIndicator := *,
  866 + semanticQueryIndicator := *,
775 867 releaseVersionIndicator := ?,
776 868 vendorInformation := *
777 869 }
... ... @@ -1412,7 +1504,12 @@ module OneM2M_Templates {
1412 1504 tokenIDs := omit,
1413 1505 localTokenIDs := omit,
1414 1506 tokenRequestIndicator := omit,
1415   - releaseVersionIndicator := "2a",
  1507 + groupRequestTargetMembers := omit,
  1508 + authorSignIndicator := omit,
  1509 + authorSigns := omit,
  1510 + authorRelIndicator := omit,
  1511 + semanticQueryIndicator := omit,
  1512 + releaseVersionIndicator := "3",
1416 1513 vendorInformation := omit
1417 1514 };
1418 1515  
... ... @@ -1440,6 +1537,11 @@ module OneM2M_Templates {
1440 1537 tokenIDs := *,
1441 1538 localTokenIDs := *,
1442 1539 tokenRequestIndicator := *,
  1540 + groupRequestTargetMembers := *,
  1541 + authorSignIndicator := *,
  1542 + authorSigns := *,
  1543 + authorRelIndicator := *,
  1544 + semanticQueryIndicator := *,
1443 1545 releaseVersionIndicator := ?,
1444 1546 vendorInformation := *
1445 1547 };
... ... @@ -1483,7 +1585,12 @@ module OneM2M_Templates {
1483 1585 tokenIDs := omit,
1484 1586 localTokenIDs := omit,
1485 1587 tokenRequestIndicator := omit,
1486   - releaseVersionIndicator := "2a",
  1588 + groupRequestTargetMembers := omit,
  1589 + authorSignIndicator := omit,
  1590 + authorSigns := omit,
  1591 + authorRelIndicator := omit,
  1592 + semanticQueryIndicator := omit,
  1593 + releaseVersionIndicator := "3",
1487 1594 vendorInformation := omit
1488 1595 };
1489 1596  
... ... @@ -1530,7 +1637,12 @@ module OneM2M_Templates {
1530 1637 tokenIDs := omit,
1531 1638 localTokenIDs := omit,
1532 1639 tokenRequestIndicator := omit,
1533   - releaseVersionIndicator := "2a",
  1640 + groupRequestTargetMembers := omit,
  1641 + authorSignIndicator := omit,
  1642 + authorSigns := omit,
  1643 + authorRelIndicator := omit,
  1644 + semanticQueryIndicator := omit,
  1645 + releaseVersionIndicator := "3",
1534 1646 vendorInformation := omit
1535 1647 };
1536 1648  
... ... @@ -1561,6 +1673,11 @@ module OneM2M_Templates {
1561 1673 tokenIDs := *,
1562 1674 localTokenIDs := *,
1563 1675 tokenRequestIndicator := *,
  1676 + groupRequestTargetMembers := *,
  1677 + authorSignIndicator := *,
  1678 + authorSigns := *,
  1679 + authorRelIndicator := *,
  1680 + semanticQueryIndicator := *,
1564 1681 releaseVersionIndicator := ?,
1565 1682 vendorInformation := *
1566 1683 };
... ... @@ -1653,7 +1770,12 @@ module OneM2M_Templates {
1653 1770 requestReachability := false,//M
1654 1771 contentSerialization := omit,//O
1655 1772 e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
1656   - supportedReleaseVersions := {"2a"}, //M
  1773 + supportedReleaseVersions := {"3"}, //M
  1774 + registrationStatus := omit,//O
  1775 + trackRegistrationPoints := omit,//O
  1776 + sessionCapabilities := omit,//O
  1777 + triggerEnable := omit,//O
  1778 + activityPatternElements := omit,//O
1657 1779 choice := omit//NP
1658 1780 };
1659 1781  
... ... @@ -1686,6 +1808,11 @@ module OneM2M_Templates {
1686 1808 contentSerialization := *,//OA
1687 1809 e2eSecInfo := *, //MA
1688 1810 supportedReleaseVersions := *, //MA//TODO It should be mandatory for AEAnnc
  1811 + registrationStatus := *,//OA
  1812 + trackRegistrationPoints := *,//OA
  1813 + sessionCapabilities := *,//OA
  1814 + triggerEnable := *,//OA
  1815 + activityPatternElements := *,//OA
1689 1816 choice := omit//NA
1690 1817 };
1691 1818  
... ... @@ -1714,8 +1841,14 @@ module OneM2M_Templates {
1714 1841 cSE_ID := *,//OA
1715 1842 requestReachability := *, //OA {"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
1716 1843 nodeLink := *,//OA
  1844 + contentSerialization := *,//OA
1717 1845 e2eSecInfo := ?,//OA
  1846 + descendantCSEs := *,//OA
1718 1847 supportedReleaseVersions := *, //OA
  1848 + multicastCapability := *,//OA
  1849 + externalGroupID := *,//OA
  1850 + triggerEnable := *,//OA
  1851 + activityPatternElements := *,//OA
1719 1852 choice := omit//NA
1720 1853 };
1721 1854  
... ... @@ -1747,7 +1880,13 @@ module OneM2M_Templates {
1747 1880 requestReachability := false,//M
1748 1881 contentSerialization := omit,//O
1749 1882 e2eSecInfo := omit, //O
1750   - supportedReleaseVersions := {"2a"}, //M
  1883 + m2M_Ext_ID := omit, //O
  1884 + supportedReleaseVersions := {"3"}, //M
  1885 + registrationStatus := omit, //O
  1886 + trackRegistrationPoints := omit, //O
  1887 + sessionCapabilities := omit, //O
  1888 + triggerEnable := omit, //O
  1889 + activityPatternElements := omit, //O
1751 1890 choice := omit//NP
1752 1891 };
1753 1892  
... ... @@ -1870,8 +2009,9 @@ module OneM2M_Templates {
1870 2009 pointOfAccess := omit,
1871 2010 nodeLink := omit,
1872 2011 dynamicAuthorizationConsultationIDs := omit,
  2012 + contentSerialization := omit,
1873 2013 e2eSecInfo := omit,
1874   - supportedReleaseVersions := {"2a"},
  2014 + supportedReleaseVersions := {"3"},
1875 2015 choice := omit
1876 2016 };
1877 2017  
... ... @@ -1945,6 +2085,7 @@ module OneM2M_Templates {
1945 2085 consistencyStrategy := p_consistencyStrategy,//O
1946 2086 groupName := omit,//O
1947 2087 semanticSupportIndicator := omit,//O
  2088 + notifyAggregation := omit,//O
1948 2089 choice := omit//NP
1949 2090 };
1950 2091  
... ... @@ -1982,6 +2123,7 @@ module OneM2M_Templates {
1982 2123 consistencyStrategy := p_consistencyStrategy,//O
1983 2124 groupName := omit,//O
1984 2125 semanticSupportIndicator := omit,//O
  2126 + notifyAggregation := omit,//O
1985 2127 choice := omit//NP
1986 2128 };
1987 2129  
... ... @@ -2009,6 +2151,7 @@ module OneM2M_Templates {
2009 2151 consistencyStrategy := *, //OA
2010 2152 groupName := *, //OA
2011 2153 semanticSupportIndicator := *,//OA
  2154 + notifyAggregation := omit,//O
2012 2155 choice := omit //NA
2013 2156 };
2014 2157  
... ... @@ -2034,7 +2177,8 @@ module OneM2M_Templates {
2034 2177 mgmtDefinition := omit,//O
2035 2178 objectIDs := omit,//O
2036 2179 objectPaths := omit,//O
2037   - description := omit//O
  2180 + description := omit,//O
  2181 + mgmtSchema := omit//O
2038 2182 };
2039 2183  
2040 2184 /**
... ... @@ -2059,7 +2203,8 @@ module OneM2M_Templates {
2059 2203 mgmtDefinition := omit,//O
2060 2204 objectIDs := omit,//O
2061 2205 objectPaths := omit,//O
2062   - description := omit//O
  2206 + description := omit,//O
  2207 + mgmtSchema := omit//O
2063 2208 };
2064 2209  
2065 2210 /**
... ... @@ -2080,7 +2225,8 @@ module OneM2M_Templates {
2080 2225 mgmtDefinition := ?, //MA
2081 2226 objectIDs := *, //OA
2082 2227 objectPaths := *, //OA
2083   - description := * //OA
  2228 + description := * ,//OA
  2229 + mgmtSchema := omit//OA
2084 2230 };
2085 2231  
2086 2232 /**
... ... @@ -2104,7 +2250,11 @@ module OneM2M_Templates {
2104 2250 announcedAttribute := omit,//O
2105 2251 nodeID := p_nodeId,//M
2106 2252 hostedCSELink := omit,//O
  2253 + hostedAELinks := omit,//O
  2254 + hostedServiceLinks := omit,//O
2107 2255 mgmtClientAddress := omit,//O
  2256 + roamingStatus := omit,//O
  2257 + networkID := omit,//O
2108 2258 choice := omit//O
2109 2259 };
2110 2260  
... ... @@ -2128,7 +2278,12 @@ module OneM2M_Templates {
2128 2278 announcedAttribute := *,//O
2129 2279 nodeID := ?,//M
2130 2280 hostedCSELink := *,//O
2131   - mgmtClientAddress := omit,//O
  2281 + hostedAELinks := *,//O
  2282 + hostedServiceLinks := *,//O
  2283 + mgmtClientAddress := *,//O
  2284 + roamingStatus := *,//O
  2285 + networkID := *,//O
  2286 +
2132 2287 choice := *//O
2133 2288 };
2134 2289  
... ... @@ -2151,7 +2306,11 @@ module OneM2M_Templates {
2151 2306 link := ?,//M
2152 2307 nodeID := ?,//M
2153 2308 hostedCSELink := *,//O
  2309 + hostedAELinks := *,//O
  2310 + hostedServiceLinks := *,//O
2154 2311 mgmtClientAddress := *,//O
  2312 + roamingStatus := *,//O
  2313 + networkID := *,//O
2155 2314 choice := omit//NP
2156 2315 };
2157 2316  
... ... @@ -2168,7 +2327,8 @@ module OneM2M_Templates {
2168 2327 creationTime := omit,//NP
2169 2328 lastModifiedTime := omit,//NP
2170 2329 labels := omit,//O
2171   - expirationTime := omit//O
  2330 + expirationTime := omit,//O
  2331 + choice := omit//NP
2172 2332 };
2173 2333  
2174 2334 /**
... ... @@ -2184,7 +2344,8 @@ module OneM2M_Templates {
2184 2344 creationTime := omit,//NP
2185 2345 lastModifiedTime := omit,//NP
2186 2346 labels := *,//O
2187   - expirationTime := *//O
  2347 + expirationTime := *,//O
  2348 + choice := omit//NP
2188 2349 };
2189 2350  
2190 2351 /**
... ... @@ -2205,6 +2366,7 @@ module OneM2M_Templates {
2205 2366 announceTo := omit,//O
2206 2367 announcedAttribute := omit,//O
2207 2368 scheduleElement := p_scheduleElement,//M
  2369 + networkCoordinated := omit,//O
2208 2370 choice := omit//NP
2209 2371 };
2210 2372  
... ... @@ -2221,7 +2383,9 @@ module OneM2M_Templates {
2221 2383 labels := *,//MA
2222 2384 expirationTime := ?,//MA M
2223 2385 link := ?,
2224   - scheduleElement := * //OA
  2386 + scheduleElement := * ,//OA
  2387 + networkCoordinated := ?,//M
  2388 + choice := omit//NP
2225 2389 };
2226 2390  
2227 2391 template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) := {
... ... @@ -2294,6 +2458,7 @@ module OneM2M_Templates {
2294 2458 notificationContentType := omit, //O
2295 2459 notificationEventCat := omit,//O
2296 2460 subscriberURI := omit,//O
  2461 + associatedCrossResourceSub := omit,//O
2297 2462 choice := omit//NP
2298 2463 };
2299 2464  
... ... @@ -2328,6 +2493,7 @@ module OneM2M_Templates {
2328 2493 notificationContentType := *, //O
2329 2494 notificationEventCat := *,//O
2330 2495 subscriberURI := *,//O
  2496 + associatedCrossResourceSub := *,//O
2331 2497 choice := *//O
2332 2498 };
2333 2499  
... ... @@ -2363,6 +2529,7 @@ module OneM2M_Templates {
2363 2529 operationMonitor_list := {},
2364 2530 attribute := p_attribute_list,
2365 2531 notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
  2532 + childResourceType := omit,
2366 2533 missingData := omit
2367 2534 };
2368 2535  
... ... @@ -2592,8 +2759,14 @@ module OneM2M_Templates {
2592 2759 requestReachability := false,//M
2593 2760 nodeLink := omit,//O
2594 2761 triggerReferenceNumber := omit,//O
  2762 + contentSerialization := omit,//O
2595 2763 e2eSecInfo := omit,//O
2596   - supportedReleaseVersions := {"2a"}, //M
  2764 + descendantCSEs := omit,//O
  2765 + supportedReleaseVersions := {"3"}, //M
  2766 + multicastCapability := omit,//O
  2767 + externalGroupID := omit,//O
  2768 + triggerEnable := omit,//O
  2769 + activityPatternElements := omit,//O
2597 2770 choice := omit//O
2598 2771 };
2599 2772  
... ... @@ -2623,8 +2796,14 @@ module OneM2M_Templates {
2623 2796 requestReachability := true,//M
2624 2797 nodeLink := omit,//O
2625 2798 triggerReferenceNumber := omit,//O
  2799 + contentSerialization := omit,//O
2626 2800 e2eSecInfo := omit,//O
2627   - supportedReleaseVersions := {"2a"}, //M
  2801 + descendantCSEs := omit,//O
  2802 + supportedReleaseVersions := {"3"}, //M
  2803 + multicastCapability := omit,//O
  2804 + externalGroupID := omit,//O
  2805 + triggerEnable := omit,//O
  2806 + activityPatternElements := omit,//O
2628 2807 choice := omit//O
2629 2808 };
2630 2809  
... ... @@ -2653,8 +2832,14 @@ module OneM2M_Templates {
2653 2832 requestReachability := ?,//M
2654 2833 nodeLink := *,//O
2655 2834 triggerReferenceNumber := omit,//O
  2835 + contentSerialization := omit,//O
2656 2836 e2eSecInfo := omit,//O
2657   - supportedReleaseVersions := {"2a"}, //M
  2837 + descendantCSEs := omit,//O
  2838 + supportedReleaseVersions := {"3"}, //M
  2839 + multicastCapability := omit,//O
  2840 + externalGroupID := omit,//O
  2841 + triggerEnable := omit,//O
  2842 + activityPatternElements := omit,//O
2658 2843 choice := omit//O
2659 2844 };
2660 2845  
... ... @@ -2699,13 +2884,19 @@ module OneM2M_Templates {
2699 2884 announceTo := omit, //O
2700 2885 announcedAttribute := omit, //O
2701 2886 locationSource := p_locationSource, //M
  2887 + locationInformationType := omit,//O
2702 2888 locationUpdatePeriod := {p_locationUpdatePeriod}, //O
2703 2889 locationTargetID := p_locationTargetID, //O
2704 2890 locationServer := p_locationServerAddress,//O
2705 2891 locationContainerID := omit, //NP
2706 2892 locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
2707 2893 locationStatus := omit, //NP
2708   - choice := omit //NP
  2894 + geographicalTargetArea := omit, //O
  2895 + geofenceEventCriteria := omit, //O
  2896 + authID := omit, //O
  2897 + retrieveLastKnownLocation := omit, //O
  2898 + locationUpdateEventCriteria := omit, //O
  2899 + choice := omit //NP
2709 2900  
2710 2901 };
2711 2902  
... ... @@ -2723,12 +2914,18 @@ module OneM2M_Templates {
2723 2914 announceTo := omit, //O
2724 2915 announcedAttribute := omit, //O
2725 2916 locationSource := int1, //M
  2917 + locationInformationType := omit,//O
2726 2918 locationUpdatePeriod := omit, //O
2727 2919 locationTargetID := omit, //O
2728 2920 locationServer := omit,//O
2729 2921 locationContainerID := omit, //NP
2730 2922 locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
2731 2923 locationStatus := omit, //NP
  2924 + geographicalTargetArea := omit, //O
  2925 + geofenceEventCriteria := omit, //O
  2926 + authID := omit, //O
  2927 + retrieveLastKnownLocation := omit, //O
  2928 + locationUpdateEventCriteria := omit, //O
2732 2929 choice := omit //NP
2733 2930 };
2734 2931  
... ... @@ -2748,13 +2945,20 @@ module OneM2M_Templates {
2748 2945 link := ?,
2749 2946 dynamicAuthorizationConsultationIDs := *, //OA
2750 2947 locationSource := *, //OA
  2948 + locationInformationType := *,//OA
2751 2949 locationUpdatePeriod := *, //OA
2752 2950 locationTargetID := *, //OA
2753 2951 locationServer := *, //OA
2754 2952 locationContainerID := *, //OA
2755 2953 locationContainerName := *, //OA
2756   - locationStatus := * //OA
2757   - };
  2954 + locationStatus := *,//OA
  2955 + geographicalTargetArea := omit, //O
  2956 + geofenceEventCriteria := omit, //O
  2957 + authID := omit, //O
  2958 + retrieveLastKnownLocation := omit, //O
  2959 + locationUpdateEventCriteria := omit, //O
  2960 + choice := omit//NP
  2961 + };
2758 2962  
2759 2963 template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
2760 2964 in template (omit) NotificationEventType p_notifEventType,
... ... @@ -2776,7 +2980,11 @@ module OneM2M_Templates {
2776 2980 notificationTarget := omit,
2777 2981 targetRemovalRequest := omit,
2778 2982 targetRemovalAllowance := omit,
2779   - iPEDiscoveryRequest := omit
  2983 + iPEDiscoveryRequest := omit,
  2984 + aERegistrationPointChange := omit,
  2985 + aEReferenceIDChange := omit,
  2986 + trackingID1 := "trackingID1",
  2987 + trackingID2 := "trackingID2"
2780 2988 };
2781 2989  
2782 2990 /**
... ... @@ -2801,6 +3009,8 @@ module OneM2M_Templates {
2801 3009 descriptor := ?, //M
2802 3010 ontologyRef := *, //O
2803 3011 relatedSemantics := *, //O
  3012 + semanticValidated := *, //O
  3013 + validationEnable := *, //O
2804 3014 choice := * //?
2805 3015 }
2806 3016  
... ... @@ -2912,6 +3122,7 @@ module OneM2M_Templates {
2912 3122 cSE_ID := omit, //O
2913 3123 deviceIdentifier := omit, //M
2914 3124 ruleLinks := omit, //O
  3125 + niddRequired := omit, //O
2915 3126 choice := omit //O
2916 3127 };
2917 3128  
... ... @@ -2946,6 +3157,7 @@ module OneM2M_Templates {
2946 3157 missingDataCurrentNr := omit,//NP
2947 3158 missingDataDetectTimer := omit,//O
2948 3159 ontologyRef := omit,//O
  3160 + contentInfo := omit,//O
2949 3161 choice := omit//NP
2950 3162 };
2951 3163  
... ... @@ -2980,6 +3192,7 @@ module OneM2M_Templates {
2980 3192 missingDataCurrentNr := omit,//NP
2981 3193 missingDataDetectTimer := *,//O
2982 3194 ontologyRef := *,//O
  3195 + contentInfo := omit,//O
2983 3196 choice := *//NP
2984 3197 };
2985 3198  
... ... @@ -3006,11 +3219,12 @@ module OneM2M_Templates {
3006 3219 currentNrOfInstances := omit,//NP
3007 3220 currentByteSize := omit,//NP
3008 3221 periodicInterval := omit,//O
3009   - missingDataDetect := omit,//O
  3222 + missingDataMaxNr := omit,//O
3010 3223 missingDataList := omit,//NP
3011 3224 missingDataCurrentNr := omit,//NP
3012 3225 missingDataDetectTimer := omit,//O
3013 3226 ontologyRef := omit,//O
  3227 + contentInfo := omit,//O
3014 3228 choice := omit//NP
3015 3229 };
3016 3230  
... ... @@ -3037,11 +3251,12 @@ module OneM2M_Templates {
3037 3251 currentNrOfInstances := *,//M OA
3038 3252 currentByteSize := *,//M OA
3039 3253 periodicInterval := *,//O OA
3040   - missingDataDetect := omit,//O NA
  3254 + missingDataMaxNr := omit,//O NA
3041 3255 missingDataList := *,//O OA
3042 3256 missingDataCurrentNr := *,//O OA
3043 3257 missingDataDetectTimer := *,//O OA
3044 3258 ontologyRef := *,//O OA
  3259 + contentInfo := omit,//O
3045 3260 choice := omit //O
3046 3261 };
3047 3262  
... ... @@ -3062,7 +3277,8 @@ module OneM2M_Templates {
3062 3277 dataGenerationTime := *,//M OA
3063 3278 content := *,//M OA
3064 3279 sequenceNr := *,//O OA
3065   - contentSize := *//M OA
  3280 + contentSize := *,//M OA
  3281 + choice := omit//NP
3066 3282 }
3067 3283  
3068 3284 /**
... ... @@ -3113,6 +3329,7 @@ module OneM2M_Templates {
3113 3329 missingDataCurrentNr := omit,//NP
3114 3330 missingDataDetectTimer := omit,//O
3115 3331 ontologyRef := omit,//O
  3332 + contentInfo := omit,//O
3116 3333 choice := omit//NP
3117 3334 };
3118 3335  
... ... @@ -3134,7 +3351,8 @@ module OneM2M_Templates {
3134 3351 dataGenerationTime := {alt_ := fx_generateTimestamp()},//M
3135 3352 content := "AnyValue",//M
3136 3353 sequenceNr := omit,//O
3137   - contentSize := omit//NP
  3354 + contentSize := omit,//NP
  3355 + choice := omit//O
3138 3356 };
3139 3357  
3140 3358 /**
... ... @@ -3155,7 +3373,8 @@ module OneM2M_Templates {
3155 3373 dataGenerationTime := ?,//M
3156 3374 content := ?,//M
3157 3375 sequenceNr := *,//O
3158   - contentSize := omit//NP
  3376 + contentSize := omit,//NP
  3377 + choice := omit//NP
3159 3378 };
3160 3379  
3161 3380 template (value) MissingData m_missingData( in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration) := {
... ... @@ -3192,8 +3411,14 @@ module OneM2M_Templates {
3192 3411 requestReachability := omit,//O
3193 3412 contentSerialization := omit,//O
3194 3413 e2eSecInfo := omit, //O
3195   - supportedReleaseVersions := {"2a"},//M
3196   - choice := omit//NP
  3414 + m2M_Ext_ID := omit, //O
  3415 + supportedReleaseVersions := {"3"}, //M
  3416 + registrationStatus := omit, //O
  3417 + trackRegistrationPoints := omit, //O
  3418 + sessionCapabilities := omit, //O
  3419 + triggerEnable := omit, //O
  3420 + activityPatternElements := omit, //O
  3421 + choice := omit //NP
3197 3422 };
3198 3423  
3199 3424 /**
... ... @@ -3246,6 +3471,7 @@ module OneM2M_Templates {
3246 3471 consistencyStrategy := omit,//NP
3247 3472 groupName := omit,//O
3248 3473 semanticSupportIndicator := omit,//O
  3474 + notifyAggregation := omit,//O
3249 3475 choice := omit//NP
3250 3476  
3251 3477 };
... ... @@ -3268,8 +3494,9 @@ module OneM2M_Templates {
3268 3494 pointOfAccess := omit,
3269 3495 nodeLink := omit,
3270 3496 dynamicAuthorizationConsultationIDs := omit,
  3497 + contentSerialization := omit,
3271 3498 e2eSecInfo := omit,
3272   - supportedReleaseVersions := {"2a"},//M
  3499 + supportedReleaseVersions := {"3"},//M
3273 3500 choice := omit
3274 3501  
3275 3502 };
... ... @@ -3285,7 +3512,8 @@ module OneM2M_Templates {
3285 3512 creationTime := omit,//NP
3286 3513 lastModifiedTime := omit,//NP
3287 3514 labels := omit,//O
3288   - expirationTime := omit//O
  3515 + expirationTime := omit,//O
  3516 + choice := omit
3289 3517 };
3290 3518  
3291 3519 /**
... ... @@ -3303,6 +3531,7 @@ module OneM2M_Templates {
3303 3531 announceTo := omit,//O
3304 3532 announcedAttribute := omit,//O
3305 3533 scheduleElement := omit,//O
  3534 + networkCoordinated := omit,//O
3306 3535 choice := omit//NP
3307 3536 };
3308 3537  
... ... @@ -3335,6 +3564,7 @@ module OneM2M_Templates {
3335 3564 notificationContentType := omit,//O
3336 3565 notificationEventCat := omit,//O
3337 3566 subscriberURI := omit,//NP
  3567 + associatedCrossResourceSub := omit,//O
3338 3568 choice := omit//NP
3339 3569 };
3340 3570  
... ... @@ -3405,13 +3635,19 @@ module OneM2M_Templates {
3405 3635 announceTo := omit,//O
3406 3636 announcedAttribute := omit,//O
3407 3637 locationSource := omit,//NP
  3638 + locationInformationType := omit,//O
3408 3639 locationUpdatePeriod := {p_locationUpdatePeriod}, //O
3409 3640 locationTargetID := omit, //NP
3410 3641 locationServer := omit, //NP
3411 3642 locationContainerID := omit, //NP
3412 3643 locationContainerName := PX_LOCATION_CONTAINER_NAME, //O
3413 3644 locationStatus := omit, //NP
3414   - choice := omit //NP
  3645 + geographicalTargetArea := omit, //O
  3646 + geofenceEventCriteria := omit, //O
  3647 + authID := omit, //O
  3648 + retrieveLastKnownLocation := omit, //O
  3649 + locationUpdateEventCriteria := omit, //O
  3650 + choice := omit //NP
3415 3651 };
3416 3652  
3417 3653 template (value) Node_optional m_contentUpdateNode := {
... ... @@ -3429,7 +3665,11 @@ module OneM2M_Templates {
3429 3665 announcedAttribute := omit,
3430 3666 nodeID := omit,
3431 3667 hostedCSELink := omit,
3432   - mgmtClientAddress := omit,
  3668 + hostedAELinks := omit,//O
  3669 + hostedServiceLinks := omit,//O
  3670 + mgmtClientAddress := omit,//O
  3671 + roamingStatus := omit,//O
  3672 + networkID := omit,//O
3433 3673 choice := omit
3434 3674 }
3435 3675  
... ... @@ -3454,9 +3694,15 @@ module OneM2M_Templates {
3454 3694 trigger_Recipient_ID := omit,
3455 3695 requestReachability := omit,
3456 3696 nodeLink := omit,
3457   - triggerReferenceNumber := omit,
3458   - e2eSecInfo := omit,
3459   - supportedReleaseVersions := omit,//O
  3697 + triggerReferenceNumber := omit,//O
  3698 + contentSerialization := omit,//O
  3699 + e2eSecInfo := omit,//O
  3700 + descendantCSEs := omit,//O
  3701 + supportedReleaseVersions := omit, //O
  3702 + multicastCapability := omit,//O
  3703 + externalGroupID := omit,//O
  3704 + triggerEnable := omit,//O
  3705 + activityPatternElements := omit,//O
3460 3706 choice := omit
3461 3707 }
3462 3708  
... ... @@ -3482,6 +3728,11 @@ module OneM2M_Templates {
3482 3728 contentSerialization := omit,
3483 3729 e2eSecInfo := omit,
3484 3730 supportedReleaseVersions := omit,
  3731 + registrationStatus := omit,//O
  3732 + trackRegistrationPoints := omit,//O
  3733 + sessionCapabilities := omit,//O
  3734 + triggerEnable := omit,//O
  3735 + activityPatternElements := omit,//O
3485 3736 choice := omit
3486 3737 }
3487 3738  
... ... @@ -3530,7 +3781,8 @@ module OneM2M_Templates {
3530 3781 consistencyStrategy := omit,
3531 3782 groupName := omit,
3532 3783 semanticSupportIndicator := omit,
3533   - choice := omit
  3784 + notifyAggregation := omit,//O
  3785 + choice := omit
3534 3786 };
3535 3787  
3536 3788 /**
... ... @@ -3563,6 +3815,7 @@ module OneM2M_Templates {
3563 3815 missingDataCurrentNr := omit,//NP
3564 3816 missingDataDetectTimer := omit,//O
3565 3817 ontologyRef := omit,//O
  3818 + contentInfo := omit,//O
3566 3819 choice := omit//NP
3567 3820 };
3568 3821  
... ... @@ -3583,7 +3836,8 @@ module OneM2M_Templates {
3583 3836 dataGenerationTime := omit,
3584 3837 content := omit,
3585 3838 sequenceNr := omit,
3586   - contentSize := omit
  3839 + contentSize := omit,
  3840 + choice := omit
3587 3841 };
3588 3842  
3589 3843  
... ... @@ -3601,7 +3855,8 @@ module OneM2M_Templates {
3601 3855 creationTime := omit,//NP
3602 3856 lastModifiedTime := omit,//NP
3603 3857 labels := omit,//O
3604   - expirationTime := omit//O
  3858 + expirationTime := omit,//O
  3859 + choice := omit//NP
3605 3860 };
3606 3861 }
3607 3862  
... ... @@ -3618,7 +3873,8 @@ module OneM2M_Templates {
3618 3873 creationTime := omit,//NP
3619 3874 lastModifiedTime := omit,//NP
3620 3875 labels := omit,//O
3621   - expirationTime := omit//O
  3876 + expirationTime := omit,//O
  3877 + choice := omit//NP
3622 3878 };
3623 3879  
3624 3880 } //end group ContentDelete
... ... @@ -3678,8 +3934,14 @@ module OneM2M_Templates {
3678 3934 nodeLink := *,//O
3679 3935 requestReachability := ?,//M
3680 3936 contentSerialization := *,//O
3681   - e2eSecInfo:= *, //O
  3937 + e2eSecInfo := *, //O
  3938 + m2M_Ext_ID := *, //O
3682 3939 supportedReleaseVersions := ?,//M
  3940 + registrationStatus := *, //O
  3941 + trackRegistrationPoints := *, //O
  3942 + sessionCapabilities := *, //O
  3943 + triggerEnable := *, //O
  3944 + activityPatternElements := *, //O
3683 3945 choice := *//O
3684 3946 };
3685 3947  
... ... @@ -3705,7 +3967,13 @@ module OneM2M_Templates {
3705 3967 requestReachability := omit,//M
3706 3968 contentSerialization := omit,//O
3707 3969 e2eSecInfo:= omit, //O
  3970 + m2M_Ext_ID := omit,//O
3708 3971 supportedReleaseVersions := omit,//M
  3972 + registrationStatus := omit,//O
  3973 + trackRegistrationPoints := omit,//O
  3974 + sessionCapabilities := omit,//O
  3975 + triggerEnable := omit,//O
  3976 + activityPatternElements := omit,//O
3709 3977 choice := omit//O
3710 3978 };
3711 3979  
... ... @@ -3731,7 +3999,13 @@ module OneM2M_Templates {
3731 3999 requestReachability := *,//M
3732 4000 contentSerialization := *,//O
3733 4001 e2eSecInfo:= *, //O
3734   - supportedReleaseVersions := ?,//M
  4002 + m2M_Ext_ID := *, //O
  4003 + supportedReleaseVersions := ?, //M
  4004 + registrationStatus := *, //O
  4005 + trackRegistrationPoints := *, //O
  4006 + sessionCapabilities := *, //O
  4007 + triggerEnable := *, //O
  4008 + activityPatternElements := *, //O
3735 4009 choice := *//O
3736 4010 };
3737 4011  
... ... @@ -3797,12 +4071,18 @@ module OneM2M_Templates {
3797 4071 announceTo := omit,//O
3798 4072 announcedAttribute := omit,//O
3799 4073 locationSource := omit,//M
  4074 + locationInformationType := omit,//O
3800 4075 locationUpdatePeriod := omit,//O
3801 4076 locationTargetID := omit,//O
3802 4077 locationServer := omit,//O
3803 4078 locationContainerID := omit,//O
3804 4079 locationContainerName := omit,//O
3805 4080 locationStatus := omit,//M
  4081 + geographicalTargetArea := omit, //O
  4082 + geofenceEventCriteria := omit, //O
  4083 + authID := omit, //O
  4084 + retrieveLastKnownLocation := omit, //O
  4085 + locationUpdateEventCriteria := omit, //O
3806 4086 choice := omit//O
3807 4087 }
3808 4088  
... ... @@ -3819,7 +4099,7 @@ module OneM2M_Templates {
3819 4099 }
3820 4100  
3821 4101 template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
3822   - choice := {subscription_list := ?} //O
  4102 + choice := {choice_list := {{subscription := ?}}} //O
3823 4103 }
3824 4104  
3825 4105 template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
... ... @@ -3873,6 +4153,7 @@ module OneM2M_Templates {
3873 4153 consistencyStrategy := *,//O
3874 4154 groupName := *,//O
3875 4155 semanticSupportIndicator := *,//O
  4156 + notifyAggregation := *, //O
3876 4157 choice := *//O
3877 4158 };
3878 4159  
... ... @@ -3899,6 +4180,7 @@ module OneM2M_Templates {
3899 4180 consistencyStrategy := *,//O
3900 4181 groupName := *,//O
3901 4182 semanticSupportIndicator := *,//O
  4183 + notifyAggregation := *,//O
3902 4184 choice := *//O
3903 4185 }
3904 4186  
... ... @@ -3925,6 +4207,7 @@ module OneM2M_Templates {
3925 4207 consistencyStrategy := omit,//O
3926 4208 groupName := omit,//O
3927 4209 semanticSupportIndicator := omit,//O
  4210 + notifyAggregation := omit,//O
3928 4211 choice := omit//O
3929 4212 }
3930 4213  
... ... @@ -4012,7 +4295,8 @@ module OneM2M_Templates {
4012 4295 creationTime := ?,//M
4013 4296 lastModifiedTime := ?,//M
4014 4297 labels := *,//O
4015   - expirationTime := ?//M
  4298 + expirationTime := ?,//M
  4299 + choice := omit//NP
4016 4300 };
4017 4301  
4018 4302 template PollingChannel_optional mw_contentPollingChannel_any := {
... ... @@ -4023,7 +4307,8 @@ module OneM2M_Templates {
4023 4307 creationTime := *,//M
4024 4308 lastModifiedTime := *,//M
4025 4309 labels := *,//O
4026   - expirationTime := *//M
  4310 + expirationTime := *,//M
  4311 + choice := omit//NP
4027 4312 };
4028 4313  
4029 4314 template PollingChannel_optional m_contentPollingChannel_allOmit := {
... ... @@ -4034,7 +4319,8 @@ module OneM2M_Templates {
4034 4319 creationTime := omit,//M
4035 4320 lastModifiedTime := omit,//M
4036 4321 labels := omit,//O
4037   - expirationTime := omit//M
  4322 + expirationTime := omit,//M
  4323 + choice := omit//NP
4038 4324 };
4039 4325  
4040 4326 template PollingChannel_optional mw_contentPollingChannel_rc1 modifies mw_contentPollingChannelBase := {
... ... @@ -4086,8 +4372,14 @@ module OneM2M_Templates {
4086 4372 requestReachability := omit,//M
4087 4373 nodeLink := omit,//O
4088 4374 triggerReferenceNumber := omit,//O
  4375 + contentSerialization := omit,//O
4089 4376 e2eSecInfo := omit,//O
  4377 + descendantCSEs := omit,//O
4090 4378 supportedReleaseVersions := omit,//M
  4379 + multicastCapability := omit,//O
  4380 + externalGroupID := omit,//O
  4381 + triggerEnable := omit,//O
  4382 + activityPatternElements := omit,//O
4091 4383 choice := omit//O
4092 4384 };
4093 4385  
... ... @@ -4133,8 +4425,14 @@ module OneM2M_Templates {
4133 4425 requestReachability := ?,//M
4134 4426 nodeLink := *,//O
4135 4427 triggerReferenceNumber := *,//O
  4428 + contentSerialization := *,//O
4136 4429 e2eSecInfo := *,//O
  4430 + descendantCSEs := *,//O
4137 4431 supportedReleaseVersions := ?,//M
  4432 + multicastCapability := *,//O
  4433 + externalGroupID := *,//O
  4434 + triggerEnable := *,//O
  4435 + activityPatternElements := *,//O
4138 4436 choice := *//O
4139 4437 };
4140 4438  
... ... @@ -4173,6 +4471,7 @@ module OneM2M_Templates {
4173 4471 announceTo := *,//O
4174 4472 announcedAttribute := *,//O
4175 4473 scheduleElement := ?,//M
  4474 + networkCoordinated := ?,//M
4176 4475 choice := *//O
4177 4476 };
4178 4477  
... ... @@ -4188,6 +4487,7 @@ module OneM2M_Templates {
4188 4487 announceTo := *,//O
4189 4488 announcedAttribute := *,//M
4190 4489 scheduleElement := *,//M
  4490 + networkCoordinated := ?,//M
4191 4491 choice := *//O
4192 4492 }
4193 4493  
... ... @@ -4203,6 +4503,7 @@ module OneM2M_Templates {
4203 4503 announceTo := omit,//O
4204 4504 announcedAttribute := omit,//M
4205 4505 scheduleElement := omit,//M
  4506 + networkCoordinated := omit,//M
4206 4507 choice := omit//O
4207 4508 }
4208 4509  
... ... @@ -4237,6 +4538,7 @@ module OneM2M_Templates {
4237 4538 announceTo := omit,//O
4238 4539 announcedAttribute := omit,//M
4239 4540 scheduleElement := omit,//M
  4541 + networkCoordinated := omit,//O
4240 4542 choice := {childResource_list := ?}//O
4241 4543 }
4242 4544  
... ... @@ -4311,6 +4613,7 @@ module OneM2M_Templates {
4311 4613 notificationContentType := *,//O
4312 4614 notificationEventCat := *,//O
4313 4615 subscriberURI := *,//O
  4616 + associatedCrossResourceSub := *,//O
4314 4617 choice := *//O
4315 4618 };
4316 4619 template Subscription_optional mw_contentSubscription_any := {
... ... @@ -4339,6 +4642,7 @@ module OneM2M_Templates {
4339 4642 notificationContentType := *,//M
4340 4643 notificationEventCat := *,//O
4341 4644 subscriberURI := *,//O
  4645 + associatedCrossResourceSub := *,//O
4342 4646 choice := *//O
4343 4647 }
4344 4648  
... ... @@ -4368,6 +4672,7 @@ module OneM2M_Templates {
4368 4672 notificationContentType := omit,//M
4369 4673 notificationEventCat := omit,//O
4370 4674 subscriberURI := omit,//O
  4675 + associatedCrossResourceSub := omit,//O
4371 4676 choice := omit//O
4372 4677 }
4373 4678  
... ... @@ -4420,6 +4725,7 @@ module OneM2M_Templates {
4420 4725 notificationContentType := omit,//M
4421 4726 notificationEventCat := omit,//O
4422 4727 subscriberURI := omit,//O
  4728 + associatedCrossResourceSub := omit,//O
4423 4729 choice := {childResource_list := ?}//O
4424 4730 }
4425 4731  
... ... @@ -4642,7 +4948,11 @@ module OneM2M_Templates {
4642 4948 notificationTarget := omit,
4643 4949 targetRemovalRequest := omit,
4644 4950 targetRemovalAllowance := omit,
4645   - iPEDiscoveryRequest := omit
  4951 + iPEDiscoveryRequest := omit,
  4952 + aERegistrationPointChange := omit,
  4953 + aEReferenceIDChange := omit,
  4954 + trackingID1 := "trackingID1",
  4955 + trackingID2 := "trackingID2"
4646 4956 };
4647 4957  
4648 4958 template Notification m_contentNotification_subscriptionVerification(XSD.ID p_creator) modifies m_contentNotification_allOmit:= {
... ... @@ -4660,9 +4970,12 @@ module OneM2M_Templates {
4660 4970 notificationTarget := *,
4661 4971 targetRemovalRequest := *,
4662 4972 targetRemovalAllowance := *,
4663   - iPEDiscoveryRequest := *
  4973 + iPEDiscoveryRequest := *,
  4974 + aERegistrationPointChange := *,
  4975 + aEReferenceIDChange := *,
  4976 + trackingID1 := ?,
  4977 + trackingID2 := ?
4664 4978 };
4665   -
4666 4979  
4667 4980 template Notification mw_contentNotificationBase := {
4668 4981 notificationEvent := *,//O
... ... @@ -4674,7 +4987,11 @@ module OneM2M_Templates {
4674 4987 notificationTarget := *,
4675 4988 targetRemovalRequest := *,
4676 4989 targetRemovalAllowance := *,
4677   - iPEDiscoveryRequest := *//O
  4990 + iPEDiscoveryRequest := *,//O
  4991 + aERegistrationPointChange := *,//O
  4992 + aEReferenceIDChange := *,//O
  4993 + trackingID1 := ?,//M
  4994 + trackingID2 := ?//M
4678 4995 };
4679 4996  
4680 4997 template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
... ... @@ -4707,7 +5024,11 @@ module OneM2M_Templates {
4707 5024 announcedAttribute := omit,
4708 5025 nodeID := omit,
4709 5026 hostedCSELink := omit,
4710   - mgmtClientAddress := omit,
  5027 + hostedAELinks := omit,//O
  5028 + hostedServiceLinks := omit,//O
  5029 + mgmtClientAddress := omit,//O
  5030 + roamingStatus := omit,//O
  5031 + networkID := omit,//O
4711 5032 choice := omit
4712 5033  
4713 5034 };
... ... @@ -4726,7 +5047,8 @@ module OneM2M_Templates {
4726 5047 supportedResourceType := ?,//M
4727 5048 pointOfAccess := ?,//M
4728 5049 nodeLink := *,//O
4729   - dynamicAuthorizationConsultationIDs := omit,
  5050 + dynamicAuthorizationConsultationIDs := *,
  5051 + contentSerialization := *,
4730 5052 e2eSecInfo := *,//O
4731 5053 supportedReleaseVersions := ?,//M
4732 5054 choice := *//O
... ... @@ -4763,6 +5085,7 @@ module OneM2M_Templates {
4763 5085 missingDataCurrentNr := omit,//O
4764 5086 missingDataDetectTimer := omit,//O
4765 5087 ontologyRef := omit,//O
  5088 + contentInfo := omit,//O
4766 5089 choice := omit//O
4767 5090 }
4768 5091  
... ... @@ -4793,6 +5116,7 @@ module OneM2M_Templates {
4793 5116 missingDataCurrentNr := *,//O
4794 5117 missingDataDetectTimer := *,//O
4795 5118 ontologyRef := *,//O
  5119 + contentInfo := *,//O
4796 5120 choice := *//O
4797 5121 };
4798 5122  
... ... @@ -4847,6 +5171,7 @@ module OneM2M_Templates {
4847 5171 missingDataCurrentNr := omit,//O
4848 5172 missingDataDetectTimer := omit,//O
4849 5173 ontologyRef := omit,//O
  5174 + contentInfo := omit,//O
4850 5175 choice := {childResource_list := ?}//O
4851 5176 }
4852 5177  
... ... @@ -4881,7 +5206,13 @@ module OneM2M_Templates {
4881 5206 requestReachability := omit,//M
4882 5207 contentSerialization := omit,//O
4883 5208 e2eSecInfo:= omit, //O
4884   - supportedReleaseVersions := {"2a"},//M
  5209 + m2M_Ext_ID := omit, //O
  5210 + supportedReleaseVersions := {"3"}, //M
  5211 + registrationStatus := omit, //O
  5212 + trackRegistrationPoints := omit, //O
  5213 + sessionCapabilities := omit, //O
  5214 + triggerEnable := omit, //O
  5215 + activityPatternElements := omit, //O
4885 5216 choice := omit//O
4886 5217 };
4887 5218  
... ... @@ -4907,7 +5238,13 @@ module OneM2M_Templates {
4907 5238 requestReachability := omit,//M
4908 5239 contentSerialization := *,//O
4909 5240 e2eSecInfo:= *, //O
4910   - supportedReleaseVersions := {"2a"},//M
  5241 + m2M_Ext_ID := omit, //O
  5242 + supportedReleaseVersions := {"3"}, //M
  5243 + registrationStatus := omit, //O
  5244 + trackRegistrationPoints := omit, //O
  5245 + sessionCapabilities := omit, //O
  5246 + triggerEnable := omit, //O
  5247 + activityPatternElements := omit, //O
4911 5248 choice := *//O
4912 5249 };
4913 5250  
... ... @@ -5094,6 +5431,7 @@ module OneM2M_Templates {
5094 5431 missingDataCurrentNr := omit,//NP
5095 5432 missingDataDetectTimer := omit,//O
5096 5433 ontologyRef := omit,//O
  5434 + contentInfo := omit,//O
5097 5435 choice := omit//NP
5098 5436 };
5099 5437  
... ... @@ -5119,7 +5457,8 @@ module OneM2M_Templates {
5119 5457 contentOffset := omit,
5120 5458 assignedTokenIdentifiers := omit,
5121 5459 tokenRequestInformation := omit,
5122   - releaseVersionIndicator := "2a",
  5460 + authorSignReqInfo := omit,
  5461 + releaseVersionIndicator := "3",
5123 5462 vendorInformation := omit
5124 5463 };
5125 5464  
... ... @@ -5149,6 +5488,7 @@ module OneM2M_Templates {
5149 5488 contentOffset := *,
5150 5489 assignedTokenIdentifiers := *,
5151 5490 tokenRequestInformation := *,
  5491 + authorSignReqInfo := *,
5152 5492 releaseVersionIndicator := ?,
5153 5493 vendorInformation := *
5154 5494  
... ... @@ -5167,6 +5507,7 @@ module OneM2M_Templates {
5167 5507 contentOffset := *,
5168 5508 assignedTokenIdentifiers := *,
5169 5509 tokenRequestInformation := *,
  5510 + authorSignReqInfo := *,
5170 5511 releaseVersionIndicator := ?,
5171 5512 vendorInformation := *
5172 5513  
... ... @@ -5185,6 +5526,7 @@ module OneM2M_Templates {
5185 5526 contentOffset := *,
5186 5527 assignedTokenIdentifiers := *,
5187 5528 tokenRequestInformation := *,
  5529 + authorSignReqInfo := *,
5188 5530 releaseVersionIndicator := ?,
5189 5531 vendorInformation := *
5190 5532 };
... ... @@ -5202,6 +5544,7 @@ module OneM2M_Templates {
5202 5544 contentOffset := *,
5203 5545 assignedTokenIdentifiers := *,
5204 5546 tokenRequestInformation := *,
  5547 + authorSignReqInfo := *,
5205 5548 releaseVersionIndicator := ?,
5206 5549 vendorInformation := *
5207 5550 };
... ... @@ -5219,6 +5562,7 @@ module OneM2M_Templates {
5219 5562 contentOffset := *,
5220 5563 assignedTokenIdentifiers := *,
5221 5564 tokenRequestInformation := *,
  5565 + authorSignReqInfo := *,
5222 5566 releaseVersionIndicator := ?,
5223 5567 vendorInformation := *
5224 5568 };
... ... @@ -5236,6 +5580,7 @@ module OneM2M_Templates {
5236 5580 contentOffset := *,
5237 5581 assignedTokenIdentifiers := *,
5238 5582 tokenRequestInformation := *,
  5583 + authorSignReqInfo := *,
5239 5584 releaseVersionIndicator := ?,
5240 5585 vendorInformation := *
5241 5586 };
... ... @@ -5253,7 +5598,8 @@ module OneM2M_Templates {
5253 5598 contentOffset := omit,
5254 5599 assignedTokenIdentifiers := omit,
5255 5600 tokenRequestInformation := omit,
5256   - releaseVersionIndicator := "2a",
  5601 + authorSignReqInfo := omit,
  5602 + releaseVersionIndicator := "3",
5257 5603 vendorInformation := omit
5258 5604 };
5259 5605  
... ... @@ -5270,6 +5616,7 @@ module OneM2M_Templates {
5270 5616 contentOffset := *,
5271 5617 assignedTokenIdentifiers := *,
5272 5618 tokenRequestInformation := *,
  5619 + authorSignReqInfo := *,
5273 5620 releaseVersionIndicator := ?,
5274 5621 vendorInformation := *
5275 5622 };
... ... @@ -5310,7 +5657,12 @@ module OneM2M_Templates {
5310 5657 tokenIDs := omit,
5311 5658 localTokenIDs := omit,
5312 5659 tokenRequestIndicator := omit,
5313   - releaseVersionIndicator := "2a",//FIXME
  5660 + groupRequestTargetMembers := omit,
  5661 + authorSignIndicator := omit,
  5662 + authorSigns := omit,
  5663 + authorRelIndicator := omit,
  5664 + semanticQueryIndicator := omit,
  5665 + releaseVersionIndicator := "3",//FIXME
5314 5666 vendorInformation := omit
5315 5667 },
5316 5668 forcedFields := omit
... ... @@ -5389,7 +5741,12 @@ module OneM2M_Templates {
5389 5741 tokenIDs := omit,
5390 5742 localTokenIDs := omit,
5391 5743 tokenRequestIndicator := omit,
5392   - releaseVersionIndicator := "2a",//FIXME
  5744 + groupRequestTargetMembers := omit,
  5745 + authorSignIndicator := omit,
  5746 + authorSigns := omit,
  5747 + authorRelIndicator := omit,
  5748 + semanticQueryIndicator := omit,
  5749 + releaseVersionIndicator := "3",//FIXME
5393 5750 vendorInformation := omit
5394 5751 },
5395 5752 forcedFields := omit
... ... @@ -5428,7 +5785,12 @@ module OneM2M_Templates {
5428 5785 tokenIDs := omit,
5429 5786 localTokenIDs := omit,
5430 5787 tokenRequestIndicator := omit,
5431   - releaseVersionIndicator := "2a",//FIXME
  5788 + groupRequestTargetMembers := omit,
  5789 + authorSignIndicator := omit,
  5790 + authorSigns := omit,
  5791 + authorRelIndicator := omit,
  5792 + semanticQueryIndicator := omit,
  5793 + releaseVersionIndicator := "3",//FIXME
5432 5794 vendorInformation := omit
5433 5795 },
5434 5796 forcedFields := omit
... ... @@ -5475,7 +5837,12 @@ module OneM2M_Templates {
5475 5837 tokenIDs := omit,
5476 5838 localTokenIDs := omit,
5477 5839 tokenRequestIndicator := omit,
5478   - releaseVersionIndicator := "2a",//FIXME
  5840 + groupRequestTargetMembers := omit,
  5841 + authorSignIndicator := omit,
  5842 + authorSigns := omit,
  5843 + authorRelIndicator := omit,
  5844 + semanticQueryIndicator := omit,
  5845 + releaseVersionIndicator := "3",//FIXME
5479 5846 vendorInformation := omit
5480 5847 },
5481 5848 forcedFields := omit
... ... @@ -5502,6 +5869,7 @@ module OneM2M_Templates {
5502 5869 contentOffset := *,
5503 5870 assignedTokenIdentifiers := *,
5504 5871 tokenRequestInformation := *,
  5872 + authorSignReqInfo := *,
5505 5873 releaseVersionIndicator := ?,//FIXME
5506 5874 vendorInformation := *
5507 5875  
... ... @@ -5520,6 +5888,7 @@ module OneM2M_Templates {
5520 5888 contentOffset := *,
5521 5889 assignedTokenIdentifiers := *,
5522 5890 tokenRequestInformation := *,
  5891 + authorSignReqInfo := *,
5523 5892 releaseVersionIndicator := ?,//FIXME
5524 5893 vendorInformation := *
5525 5894  
... ... @@ -5538,6 +5907,7 @@ module OneM2M_Templates {
5538 5907 contentOffset := *,
5539 5908 assignedTokenIdentifiers := *,
5540 5909 tokenRequestInformation := *,
  5910 + authorSignReqInfo := *,
5541 5911 releaseVersionIndicator := ?,//FIXME
5542 5912 vendorInformation := *
5543 5913  
... ...