From 84a1838b0efef1a02519c3673941abb24872be04 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 14 Jun 2022 11:17:27 +0200
Subject: [PATCH] SDS-2021-0274R02-requestAggregationForPollingChannel_R4
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
CDT-commonTypes.xsd | 4 +++-
CDT-pollingChannel.xsd | 4 ++--
CDT-requestPrimitive.xsd | 6 ++++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index f72cf63..52475fd 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -1544,7 +1544,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="evalCriteria" type="m2m:evalCriteria" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
-
+
+ <!-- m2m:aggregatedRequestPrimitives is in the CDT-requestPrimitive xsd file -->
+
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
defined below -->
diff --git a/CDT-pollingChannel.xsd b/CDT-pollingChannel.xsd
index 7c039b5..7bae087 100644
--- a/CDT-pollingChannel.xsd
+++ b/CDT-pollingChannel.xsd
@@ -37,8 +37,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<xs:extension base="m2m:subordinateResource">
<xs:sequence>
- <!-- No Resource Specific Attributes -->
-
+ <!-- Resource Specific Attributes -->
+ <xs:element name="requestAggregation" type="xs:boolean" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 2784f32..62e638a 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -143,6 +143,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
<xs:element name="attributeList" type="m2m:attributeList" />
+
+ <xs:complexType name="aggregatedRequestPrimitives">
+ <xs:sequence>
+ <xs:element ref="m2m:requestPrimitive" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
--
GitLab