From ff55dc9f6f4ad86401c46a03ff5498614f66d5a1 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 18 May 2022 22:18:26 +0200
Subject: [PATCH] SDS-2021-0180R05-enum_areaNwkType_R4
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
CDT-areaNwkInfo.xsd | 4 ++--
CDT-commonTypes.xsd | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CDT-areaNwkInfo.xsd b/CDT-areaNwkInfo.xsd
index 5cd5c19..82b5a9a 100644
--- a/CDT-areaNwkInfo.xsd
+++ b/CDT-areaNwkInfo.xsd
@@ -36,7 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<!-- Resource Specific Attributes -->
<xs:sequence>
- <xs:element name="areaNwkType" type="xs:string" />
+ <xs:element name="areaNwkType" type="m2m:areaNwkType" />
<xs:element name="listOfDevices" type="m2m:listOfURIs" />
<!-- Child Resources -->
@@ -57,7 +57,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedMgmtResource">
<!-- Resource Specific Attributes -->
<xs:sequence>
- <xs:element name="areaNwkType" type="xs:string" minOccurs="0" />
+ <xs:element name="areaNwkType" type="m2m:areaNwkType" minOccurs="0" />
<xs:element name="listOfDevices" type="m2m:listOfURIs" minOccurs="0" />
<!-- Child Resources -->
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index c96c14f..8efd718 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -531,6 +531,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="areaNwkType">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="urn:[a-z0-9][a-z0-9-]{0,31}:[a-z0-9()+,\-.:=@;$_!*'%/?#]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="resourceList" >
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
--
GitLab