From 9c79ea268dd9c4cdd5797875314bd1d095ccb762 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 6 Feb 2023 13:22:13 +0100
Subject: [PATCH] SDS-2019-0513R02-SSP_mapping_in_AuthProfile

---
 DCFG-MAFClientRegCfg.xsd       | 4 ++--
 DCFG-MEFClientRegCfg.xsd       | 4 ++--
 DCFG-OAuth2.xsd                | 4 ++--
 DCFG-authenticationProfile.xsd | 7 ++++---
 DCFG-commonTypes.xsd           | 4 ++--
 DCFG-dataCollection.xsd        | 4 ++--
 DCFG-myCertFileCred.xsd        | 4 ++--
 DCFG-registration.xsd          | 4 ++--
 DCFG-trustAnchorCred.xsd       | 4 ++--
 DCFG-wifiClient.xsd            | 4 ++--
 10 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 56f254f..616a628 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index aa7c8f9..d8e7e46 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-OAuth2.xsd b/DCFG-OAuth2.xsd
index 94dc692..1fbc2ac 100644
--- a/DCFG-OAuth2.xsd
+++ b/DCFG-OAuth2.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index a70a4ae..129d6af 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
@@ -72,7 +72,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 								</xs:union>
 							</xs:simpleType>
 						</xs:element>
-
+						<xs:element name="M2M-Sub-ID" type="xs:string" minOccurs="0"/>
+						
 						<!-- Instantiations of this [authenticationProfile] resource type shall include mgmntLink's to
 	                         the following children:
 	                         0 .. L mgmtLink to an instance of resource type [trustAnchorCred]  
diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index f0d87b4..27438b3 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
 	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index 2bae75e..7ade30e 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 7b37217..2416cdd 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index de4bfa4..6974210 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
 	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 3c6fb79..848c793 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-wifiClient.xsd b/DCFG-wifiClient.xsd
index 693da1c..3c8cb4e 100644
--- a/DCFG-wifiClient.xsd
+++ b/DCFG-wifiClient.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
-- 
GitLab