From b3dd4c7daca39bf75b43addb387e910652c6273c Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 30 Jan 2023 12:01:39 +0100
Subject: [PATCH] SDS-2022-0157-TS-0004_action_child_resource_R4
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
CDT-AE.xsd | 3 +++
CDT-CSEBase.xsd | 2 ++
CDT-action.xsd | 2 +-
CDT-container.xsd | 3 +++
CDT-group.xsd | 3 +++
CDT-node.xsd | 3 +++
CDT-remoteCSE.xsd | 3 +++
CDT-state.xsd | 2 +-
CDT-timeSeries.xsd | 3 +++
CDT-transaction.xsd | 2 ++
10 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 0c2b53d..be38d65 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -44,6 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
<xs:include schemaLocation="CDT-primitiveProfile.xsd" />
+ <xs:include schemaLocation="CDT-action.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -93,6 +94,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:timeSyncBeacon" />
<xs:element ref="m2m:nwMonitoringReq" />
<xs:element ref="m2m:primitiveProfile" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -152,6 +154,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:e2eQosSession" />
<xs:element ref="m2m:nwMonitoringReq" />
<xs:element ref="m2m:primitiveProfile" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index db3b573..3ec5882 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.xsd
@@ -63,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
<xs:include schemaLocation="CDT-primitiveProfile.xsd" />
+ <xs:include schemaLocation="CDT-action.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
@@ -130,6 +131,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:timeSyncBeacon" />
<xs:element ref="m2m:nwMonitoringReq" />
<xs:element ref="m2m:primitiveProfile" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-action.xsd b/CDT-action.xsd
index 4fd1603..17874ca 100644
--- a/CDT-action.xsd
+++ b/CDT-action.xsd
@@ -90,7 +90,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:dependency" />
+ <xs:element ref="m2m:dependencyAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
diff --git a/CDT-container.xsd b/CDT-container.xsd
index d3fc096..55eed9c 100644
--- a/CDT-container.xsd
+++ b/CDT-container.xsd
@@ -32,6 +32,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-timeSeries.xsd" />
<xs:include schemaLocation="CDT-transaction.xsd"/>
+ <xs:include schemaLocation="CDT-action.xsd"/>
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
@@ -64,6 +65,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -106,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-group.xsd b/CDT-group.xsd
index 6810f8a..37c9eaf 100644
--- a/CDT-group.xsd
+++ b/CDT-group.xsd
@@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-transaction.xsd"/>
+ <xs:include schemaLocation="CDT-action.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
@@ -67,6 +68,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -108,6 +110,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-node.xsd b/CDT-node.xsd
index c5c4294..dee9a99 100644
--- a/CDT-node.xsd
+++ b/CDT-node.xsd
@@ -44,6 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-transaction.xsd"/>
<xs:include schemaLocation="CDT-schedule.xsd"/>
+ <xs:include schemaLocation="CDT-action.xsd"/>
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -81,6 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:transaction" />
<xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -123,6 +125,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:transaction" />
<xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index 7400f67..a443418 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -46,6 +46,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
<xs:include schemaLocation="CDT-primitiveProfile.xsd" />
+ <xs:include schemaLocation="CDT-action.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -107,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:nwMonitoringReq" />
<xs:element ref="m2m:primitiveProfile" />
<xs:element ref="m2m:primitiveProfileAnnc" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -169,6 +171,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:nwMonitoringReq" />
<xs:element ref="m2m:primitiveProfile" />
<xs:element ref="m2m:primitiveProfileAnnc" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-state.xsd b/CDT-state.xsd
index 6c1c42f..082d725 100644
--- a/CDT-state.xsd
+++ b/CDT-state.xsd
@@ -76,7 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
- <xs:element ref="m2m:action" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-timeSeries.xsd b/CDT-timeSeries.xsd
index 903b561..dd78e87 100644
--- a/CDT-timeSeries.xsd
+++ b/CDT-timeSeries.xsd
@@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-transaction.xsd"/>
+ <xs:include schemaLocation="CDT-action.xsd"/>
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
@@ -64,6 +65,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -105,6 +107,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:transaction" />
+ <xs:element ref="m2m:actionAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-transaction.xsd b/CDT-transaction.xsd
index dedb090..934eb16 100644
--- a/CDT-transaction.xsd
+++ b/CDT-transaction.xsd
@@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-responsePrimitive.xsd" />
+ <xs:include schemaLocation="CDT-action.xsd" />
<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
@@ -55,6 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:action" />
</xs:choice>
</xs:choice>
</xs:sequence>
--
GitLab