From dfdd6a61254344a86b8bbfa4e359bc5201f8b302 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Fri, 23 Jul 2021 11:00:48 +0100
Subject: [PATCH 1/7] Generic object mechanism and examples

---
 103221-1/TS_103_221_01.xsd                    | 153 +++++++++++++++++-
 103221-1/examples/CreateObject_example.xml    |  14 ++
 .../examples/GetObjectResponse_example.xml    |  13 ++
 103221-1/examples/GetObject_example.xml       |  11 ++
 .../examples/ListObjectResponse_example.xml   |  13 ++
 103221-1/examples/ListObject_example.xml      |  11 ++
 6 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 103221-1/examples/CreateObject_example.xml
 create mode 100644 103221-1/examples/GetObjectResponse_example.xml
 create mode 100644 103221-1/examples/GetObject_example.xml
 create mode 100644 103221-1/examples/ListObjectResponse_example.xml
 create mode 100644 103221-1/examples/ListObject_example.xml

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 2cf5206..76ca9c6 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -101,7 +101,12 @@
 			<xs:enumeration value="ReportNEIssue"/>
 			<xs:enumeration value="Ping"/>
 			<xs:enumeration value="Keepalive"/>
-		</xs:restriction>
+      <xs:enumeration value="CreateObject"/>
+      <xs:enumeration value="UpdateObject"/>
+      <xs:enumeration value="GetObject"/>
+      <xs:enumeration value="DeleteObject"/>
+      <xs:enumeration value="ListObjectsOfType"/>
+    </xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="ErrorInformation">
 		<xs:sequence>
@@ -787,4 +792,150 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+
+  <xs:simpleType name="X1ObjectID">
+    <xs:restriction base="etsi103280:UUID"></xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="X1ObjectType">
+    <xs:restriction base="xs:string"></xs:restriction>
+  </xs:simpleType>
+  
+  <xs:complexType name="X1Object" abstract="true">
+    <xs:sequence>
+      <xs:element name="objectId" type="X1ObjectID"></xs:element>
+    </xs:sequence>    
+  </xs:complexType>
+
+  <xs:complexType name="FooObject">
+    <xs:complexContent>
+      <xs:extension base="X1Object">
+        <xs:sequence>
+          <xs:element name="Foo" type="xs:int"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BarObject">
+    <xs:complexContent>
+      <xs:extension base="X1Object">
+        <xs:sequence>
+          <xs:element name="Bar" type="xs:string"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
+  <xs:complexType name="CreateObject">
+    <xs:complexContent>
+      <xs:extension base="X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="createObject" type="X1Object"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="CreateObjectResponse">
+    <xs:complexContent>
+      <xs:extension base="X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="oK" type="OK"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
+  <xs:complexType name="UpdateObject">
+    <xs:complexContent>
+      <xs:extension base="X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="updateObject" type="X1Object"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="UpdateObjectResponse">
+    <xs:complexContent>
+      <xs:extension base="X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="oK" type="OK"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  
+  <xs:complexType name="GetObject">
+    <xs:complexContent>
+      <xs:extension base="X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="objectId" type="X1ObjectID"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="GetObjectResponse">
+    <xs:complexContent>
+      <xs:extension base="X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="object" type="X1Object"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  
+  <xs:complexType name="DeleteObject">
+    <xs:complexContent>
+      <xs:extension base="X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="objectId" type="X1ObjectID"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="DeleteObjectResponse">
+    <xs:complexContent>
+      <xs:extension base="X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="oK" type="OK"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+
+  <xs:complexType name="ListObjectsOfType">
+    <xs:complexContent>
+      <xs:extension base="X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="objectType" type="X1ObjectType"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="ListObjectsOfTypeResponse">
+    <xs:complexContent>
+      <xs:extension base="X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="listOfObjects" type="ListOfX1Objects"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="ListOfX1Objects">
+    <xs:sequence>
+      <xs:element name="objectId" type="X1ObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  
 </xs:schema>
diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml
new file mode 100644
index 0000000..2544ee1
--- /dev/null
+++ b/103221-1/examples/CreateObject_example.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <x1RequestMessage xsi:type="CreateObject">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.6.1</version>
+    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
+    <createObject xsi:type="FooObject">
+      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+      <Foo>1</Foo>
+    </createObject>
+  </x1RequestMessage>
+</X1Request>
diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml
new file mode 100644
index 0000000..e51badd
--- /dev/null
+++ b/103221-1/examples/GetObjectResponse_example.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<X1Response xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <x1ResponseMessage xsi:type="GetObjectResponse">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.6.1</version>
+    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
+    <object xsi:type="FooObject">
+      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+    </object>
+  </x1ResponseMessage>
+</X1Response>
diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml
new file mode 100644
index 0000000..fa1b356
--- /dev/null
+++ b/103221-1/examples/GetObject_example.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <x1RequestMessage xsi:type="GetObject">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.6.1</version>
+    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
+    <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+  </x1RequestMessage>
+</X1Request>
diff --git a/103221-1/examples/ListObjectResponse_example.xml b/103221-1/examples/ListObjectResponse_example.xml
new file mode 100644
index 0000000..8b79d9f
--- /dev/null
+++ b/103221-1/examples/ListObjectResponse_example.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<X1Response xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <x1ResponseMessage xsi:type="ListObjectsOfTypeResponse">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.6.1</version>
+    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
+    <listOfObjects>
+      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+    </listOfObjects>
+  </x1ResponseMessage>
+</X1Response>
diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml
new file mode 100644
index 0000000..8876a1f
--- /dev/null
+++ b/103221-1/examples/ListObject_example.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <x1RequestMessage xsi:type="ListObjectsOfType">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.6.1</version>
+    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
+    <objectType>FooObject</objectType>
+  </x1RequestMessage>
+</X1Request>
-- 
GitLab


From e6fc58ea3edaf92ecfac5e02ae0d5ffd02a23d7c Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Wed, 28 Jul 2021 11:30:12 +0100
Subject: [PATCH 2/7] Updating to match first draft of CR

---
 103221-1/TS_103_221_01.xsd                      | 16 +++++++++-------
 103221-1/examples/CreateObject_example.xml      |  2 +-
 103221-1/examples/GetObjectResponse_example.xml |  1 +
 103221-1/examples/ListObject_example.xml        |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 76ca9c6..0dab420 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -798,7 +798,9 @@
   </xs:simpleType>
 
   <xs:simpleType name="X1ObjectType">
-    <xs:restriction base="xs:string"></xs:restriction>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
+    </xs:restriction>
   </xs:simpleType>
   
   <xs:complexType name="X1Object" abstract="true">
@@ -828,7 +830,7 @@
   </xs:complexType>
 
 
-  <xs:complexType name="CreateObject">
+  <xs:complexType name="CreateObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -849,11 +851,11 @@
   </xs:complexType>
 
 
-  <xs:complexType name="UpdateObject">
+  <xs:complexType name="ModifyObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="updateObject" type="X1Object"></xs:element>
+          <xs:element name="modifyObject" type="X1Object"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -870,7 +872,7 @@
   </xs:complexType>
 
   
-  <xs:complexType name="GetObject">
+  <xs:complexType name="GetObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -891,7 +893,7 @@
   </xs:complexType>
   
   
-  <xs:complexType name="DeleteObject">
+  <xs:complexType name="DeleteObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -912,7 +914,7 @@
   </xs:complexType>
   
 
-  <xs:complexType name="ListObjectsOfType">
+  <xs:complexType name="ListObjectsOfTypeRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml
index 2544ee1..d64190e 100644
--- a/103221-1/examples/CreateObject_example.xml
+++ b/103221-1/examples/CreateObject_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <x1RequestMessage xsi:type="CreateObject">
+  <x1RequestMessage xsi:type="CreateObjectRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml
index e51badd..a39e67b 100644
--- a/103221-1/examples/GetObjectResponse_example.xml
+++ b/103221-1/examples/GetObjectResponse_example.xml
@@ -8,6 +8,7 @@
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
     <object xsi:type="FooObject">
       <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+      <Foo>1</Foo>
     </object>
   </x1ResponseMessage>
 </X1Response>
diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml
index 8876a1f..6e6187b 100644
--- a/103221-1/examples/ListObject_example.xml
+++ b/103221-1/examples/ListObject_example.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <x1RequestMessage xsi:type="ListObjectsOfType">
+  <x1RequestMessage xsi:type="ListObjectsOfTypeRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
     <version>v1.6.1</version>
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
-    <objectType>FooObject</objectType>
+    <objectType>Q{http://uri.etsi.org/03221/X1/2017/10}Foo</objectType>
   </x1RequestMessage>
 </X1Request>
-- 
GitLab


From 4ab6bd4e70c5621e88a37c5851b6152dd81c2ecf Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 16 Sep 2021 08:44:27 +0100
Subject: [PATCH 3/7] Updating after rap meeting

---
 103221-1/TS_103_221_01.xsd                    | 72 +++++++++----------
 103221-1/examples/CreateObject_example.xml    | 10 +--
 103221-1/examples/ExampleGenericObjects.xsd   | 38 ++++++++++
 .../GetAllDetailsResponse_example2.xml        | 67 +++++++++++++++++
 .../examples/GetObjectResponse_example.xml    | 12 ++--
 103221-1/examples/GetObject_example.xml       |  2 +-
 .../ListAllDetailsResponse_example2.xml       | 19 +++++
 7 files changed, 171 insertions(+), 49 deletions(-)
 create mode 100644 103221-1/examples/ExampleGenericObjects.xsd
 create mode 100644 103221-1/examples/GetAllDetailsResponse_example2.xml
 create mode 100644 103221-1/examples/ListAllDetailsResponse_example2.xml

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 0dab420..5ea96ac 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -631,6 +631,7 @@
 					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
 					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
 					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
+          <xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -660,6 +661,7 @@
 				<xs:sequence>
 					<xs:element name="ListOfXIDs" type="ListOfXids"/>
 					<xs:element name="ListOfDIDs" type="ListOfDids"/>
+          <xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -793,48 +795,27 @@
 		</xs:complexContent>
 	</xs:complexType>
 
-  <xs:simpleType name="X1ObjectID">
+  <xs:simpleType name="GenericObjectID">
     <xs:restriction base="etsi103280:UUID"></xs:restriction>
   </xs:simpleType>
-
-  <xs:simpleType name="X1ObjectType">
+  
+  <xs:simpleType name="GenericObjectType">
     <xs:restriction base="xs:string">
       <xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
     </xs:restriction>
   </xs:simpleType>
   
-  <xs:complexType name="X1Object" abstract="true">
+  <xs:complexType name="GenericObject" abstract="true">
     <xs:sequence>
-      <xs:element name="objectId" type="X1ObjectID"></xs:element>
+      <xs:element name="objectId" type="GenericObjectID"></xs:element>
     </xs:sequence>    
   </xs:complexType>
 
-  <xs:complexType name="FooObject">
-    <xs:complexContent>
-      <xs:extension base="X1Object">
-        <xs:sequence>
-          <xs:element name="Foo" type="xs:int"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="BarObject">
-    <xs:complexContent>
-      <xs:extension base="X1Object">
-        <xs:sequence>
-          <xs:element name="Bar" type="xs:string"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
   <xs:complexType name="CreateObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="createObject" type="X1Object"></xs:element>
+          <xs:element name="createObject" type="GenericObject"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -850,12 +831,11 @@
     </xs:complexContent>
   </xs:complexType>
 
-
   <xs:complexType name="ModifyObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="modifyObject" type="X1Object"></xs:element>
+          <xs:element name="modifyObject" type="GenericObject"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -870,13 +850,12 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   
   <xs:complexType name="GetObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="objectId" type="X1ObjectID"></xs:element>
+          <xs:element name="objectId" type="GenericObjectID"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -886,18 +865,34 @@
     <xs:complexContent>
       <xs:extension base="X1ResponseMessage">
         <xs:sequence>
-          <xs:element name="object" type="X1Object"/>
+          <xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
+  <xs:complexType name="GenericObjectResponseDetails">
+    <xs:sequence>
+        <xs:element name="object" type="GenericObject"/>
+        <xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>      
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ListOfGenericObjectResponseDetails">
+    <xs:sequence>
+      <xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="GenericObjectStatus">
+    <xs:sequence></xs:sequence>
+  </xs:complexType>
   
   <xs:complexType name="DeleteObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="objectId" type="X1ObjectID"></xs:element>
+          <xs:element name="objectId" type="GenericObjectID"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -912,13 +907,12 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
 
   <xs:complexType name="ListObjectsOfTypeRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="objectType" type="X1ObjectType"></xs:element>
+          <xs:element name="objectType" type="GenericObjectType"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -928,15 +922,15 @@
     <xs:complexContent>
       <xs:extension base="X1ResponseMessage">
         <xs:sequence>
-          <xs:element name="listOfObjects" type="ListOfX1Objects"></xs:element>
+          <xs:element name="listOfObjects" type="ListOfGenericObjectIDs"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="ListOfX1Objects">
+  <xs:complexType name="ListOfGenericObjectIDs">
     <xs:sequence>
-      <xs:element name="objectId" type="X1ObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
+      <xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
     </xs:sequence>
   </xs:complexType>
   
diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml
index d64190e..514a182 100644
--- a/103221-1/examples/CreateObject_example.xml
+++ b/103221-1/examples/CreateObject_example.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" ?>
-<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" 
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:example="exampleGenericObject">
   <x1RequestMessage xsi:type="CreateObjectRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
-    <version>v1.6.1</version>
+    <version>v1.9.1</version>
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
-    <createObject xsi:type="FooObject">
+    <createObject xsi:type="example:FooObject">
       <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
-      <Foo>1</Foo>
+      <example:Foo>1</example:Foo>
     </createObject>
   </x1RequestMessage>
 </X1Request>
diff --git a/103221-1/examples/ExampleGenericObjects.xsd b/103221-1/examples/ExampleGenericObjects.xsd
new file mode 100644
index 0000000..8b20e5f
--- /dev/null
+++ b/103221-1/examples/ExampleGenericObjects.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="exampleGenericObject"
+           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
+           targetNamespace="exampleGenericObject" elementFormDefault="qualified">
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+  
+  <xs:complexType name="FooObject">
+    <xs:complexContent>
+      <xs:extension base="x1:GenericObject">
+        <xs:sequence>
+          <xs:element name="Foo" type="xs:int"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="FooStatus">
+    <xs:complexContent>
+      <xs:extension base="x1:GenericObjectStatus">
+        <xs:sequence>
+          <xs:element name="FooStatus" type="xs:string"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BarObject">
+    <xs:complexContent>
+      <xs:extension base="x1:GenericObject">
+        <xs:sequence>
+          <xs:element name="Bar" type="xs:string"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+</xs:schema>
\ No newline at end of file
diff --git a/103221-1/examples/GetAllDetailsResponse_example2.xml b/103221-1/examples/GetAllDetailsResponse_example2.xml
new file mode 100644
index 0000000..0810429
--- /dev/null
+++ b/103221-1/examples/GetAllDetailsResponse_example2.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<ns1:X1Response xmlns:ns1="http://uri.etsi.org/03221/X1/2017/10" xmlns:ns2="http://uri.etsi.org/03280/common/2017/07" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:exampleGenericObject="exampleGenericObject">
+  <ns1:x1ResponseMessage xsi:type="ns1:GetAllDetailsResponse">
+    <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
+    <ns1:neIdentifier>neID</ns1:neIdentifier>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.496743Z</ns1:messageTimestamp>
+    <ns1:version>v1.9.1</ns1:version>
+    <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
+    <ns1:neStatusDetails>
+      <ns1:neStatus>OK</ns1:neStatus>
+      <ns1:listOfFaults/>
+    </ns1:neStatusDetails>
+    <ns1:listOfTaskResponseDetails>
+      <ns1:taskResponseDetails>
+        <ns1:taskDetails>
+          <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
+          <ns1:targetIdentifiers>
+            <ns1:targetIdentifier>
+              <ns1:e164Number>447700900000</ns1:e164Number>
+            </ns1:targetIdentifier>
+          </ns1:targetIdentifiers>
+          <ns1:deliveryType>X2andX3</ns1:deliveryType>
+          <ns1:listOfDIDs>
+            <ns1:dId>1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9</ns1:dId>
+          </ns1:listOfDIDs>
+        </ns1:taskDetails>
+        <ns1:taskStatus>
+          <ns1:provisioningStatus>complete</ns1:provisioningStatus>
+          <ns1:listOfFaults/>
+        </ns1:taskStatus>
+      </ns1:taskResponseDetails>
+    </ns1:listOfTaskResponseDetails>
+    <ns1:listOfDestinationResponseDetails>
+      <ns1:destinationResponseDetails>
+        <ns1:destinationDetails>
+          <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
+          <ns1:deliveryType>X2andX3</ns1:deliveryType>
+          <ns1:deliveryAddress>
+            <ns1:ipAddressAndPort>
+              <ns2:address>
+                <ns2:IPv4Address>192.0.2.2</ns2:IPv4Address>
+              </ns2:address>
+              <ns2:port>
+                <ns2:TCPPort>12345</ns2:TCPPort>
+              </ns2:port>
+            </ns1:ipAddressAndPort>
+          </ns1:deliveryAddress>
+        </ns1:destinationDetails>
+        <ns1:destinationStatus>
+          <ns1:destinationDeliveryStatus>activeAndWorking</ns1:destinationDeliveryStatus>
+          <ns1:listOfFaults/>
+        </ns1:destinationStatus>
+      </ns1:destinationResponseDetails>
+    </ns1:listOfDestinationResponseDetails>
+    <ns1:listOfGenericObjectResponseDetails>
+      <ns1:genericObjectResponseDetails>
+        <ns1:object xsi:type="exampleGenericObject:FooObject">
+          <ns1:objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</ns1:objectId>
+          <exampleGenericObject:Foo>1</exampleGenericObject:Foo>
+        </ns1:object>
+        <ns1:status xsi:type="exampleGenericObject:FooStatus">
+          <exampleGenericObject:FooStatus>OK</exampleGenericObject:FooStatus>
+        </ns1:status>
+      </ns1:genericObjectResponseDetails>
+    </ns1:listOfGenericObjectResponseDetails>
+  </ns1:x1ResponseMessage>
+</ns1:X1Response>
diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml
index a39e67b..4892d37 100644
--- a/103221-1/examples/GetObjectResponse_example.xml
+++ b/103221-1/examples/GetObjectResponse_example.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" ?>
-<X1Response xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<X1Response xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:exampleGenericObject="exampleGenericObject">
   <x1ResponseMessage xsi:type="GetObjectResponse">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
     <version>v1.6.1</version>
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
-    <object xsi:type="FooObject">
-      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
-      <Foo>1</Foo>
-    </object>
+    <genericObjectResponseDetails>
+      <object xsi:type="exampleGenericObject:FooObject">
+        <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+        <exampleGenericObject:Foo>1</exampleGenericObject:Foo>
+      </object>
+    </genericObjectResponseDetails>
   </x1ResponseMessage>
 </X1Response>
diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml
index fa1b356..8a47ff2 100644
--- a/103221-1/examples/GetObject_example.xml
+++ b/103221-1/examples/GetObject_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <x1RequestMessage xsi:type="GetObject">
+  <x1RequestMessage xsi:type="GetObjectRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
diff --git a/103221-1/examples/ListAllDetailsResponse_example2.xml b/103221-1/examples/ListAllDetailsResponse_example2.xml
new file mode 100644
index 0000000..d694b12
--- /dev/null
+++ b/103221-1/examples/ListAllDetailsResponse_example2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<ns1:X1Response xmlns:ns1="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <ns1:x1ResponseMessage xsi:type="ns1:ListAllDetailsResponse">
+    <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
+    <ns1:neIdentifier>neID</ns1:neIdentifier>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
+    <ns1:version>v1.6.1</ns1:version>
+    <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
+    <ns1:ListOfXIDs>
+      <ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
+    </ns1:ListOfXIDs>
+    <ns1:ListOfDIDs>
+      <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
+    </ns1:ListOfDIDs>
+    <ns1:ListOfGenericObjectIDs>
+      <ns1:objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</ns1:objectId>
+    </ns1:ListOfGenericObjectIDs>
+  </ns1:x1ResponseMessage>
+</ns1:X1Response>
-- 
GitLab


From 0e1835b9f53e329aff71d55856888570581553c4 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 11 Oct 2021 08:02:16 +0100
Subject: [PATCH 4/7] Changing indentation

---
 103221-1/TS_103_221_01.xsd | 270 ++++++++++++++++++-------------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index ca39859..c253a0e 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -101,12 +101,12 @@
 			<xs:enumeration value="ReportNEIssue"/>
 			<xs:enumeration value="Ping"/>
 			<xs:enumeration value="Keepalive"/>
-      <xs:enumeration value="CreateObject"/>
-      <xs:enumeration value="UpdateObject"/>
-      <xs:enumeration value="GetObject"/>
-      <xs:enumeration value="DeleteObject"/>
-      <xs:enumeration value="ListObjectsOfType"/>
-    </xs:restriction>
+			<xs:enumeration value="CreateObject"/>
+			<xs:enumeration value="UpdateObject"/>
+			<xs:enumeration value="GetObject"/>
+			<xs:enumeration value="DeleteObject"/>
+			<xs:enumeration value="ListObjectsOfType"/>
+		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="ErrorInformation">
 		<xs:sequence>
@@ -633,7 +633,7 @@
 					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
 					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
 					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
-          <xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
+					<xs:element name="listOfGenericObjectResponseDetails" type="ListOfGenericObjectResponseDetails" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -663,7 +663,7 @@
 				<xs:sequence>
 					<xs:element name="ListOfXIDs" type="ListOfXids"/>
 					<xs:element name="ListOfDIDs" type="ListOfDids"/>
-          <xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"></xs:element>
+					<xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -797,143 +797,143 @@
 		</xs:complexContent>
 	</xs:complexType>
 
-  <xs:simpleType name="GenericObjectID">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="GenericObjectType">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:complexType name="GenericObject" abstract="true">
-    <xs:sequence>
-      <xs:element name="objectId" type="GenericObjectID"></xs:element>
-    </xs:sequence>    
-  </xs:complexType>
+	<xs:simpleType name="GenericObjectID">
+		<xs:restriction base="etsi103280:UUID"></xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="GenericObjectType">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:complexType name="GenericObject" abstract="true">
+		<xs:sequence>
+			<xs:element name="objectId" type="GenericObjectID"></xs:element>
+		</xs:sequence>		
+	</xs:complexType>
 
-  <xs:complexType name="CreateObjectRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="createObject" type="GenericObject"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="CreateObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="createObject" type="GenericObject"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="CreateObjectResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="CreateObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="ModifyObjectRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="modifyObject" type="GenericObject"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="ModifyObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="modifyObject" type="GenericObject"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="UpdateObjectResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="GetObjectRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="objectId" type="GenericObjectID"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="UpdateObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<xs:complexType name="GetObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectId" type="GenericObjectID"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="GetObjectResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="GetObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="GenericObjectResponseDetails">
-    <xs:sequence>
-        <xs:element name="object" type="GenericObject"/>
-        <xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>      
-    </xs:sequence>
-  </xs:complexType>
+	<xs:complexType name="GenericObjectResponseDetails">
+		<xs:sequence>
+				<xs:element name="object" type="GenericObject"/>
+				<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>			
+		</xs:sequence>
+	</xs:complexType>
 
-  <xs:complexType name="ListOfGenericObjectResponseDetails">
-    <xs:sequence>
-      <xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
+	<xs:complexType name="ListOfGenericObjectResponseDetails">
+		<xs:sequence>
+			<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
-  <xs:complexType name="GenericObjectStatus">
-    <xs:sequence></xs:sequence>
-  </xs:complexType>
-  
-  <xs:complexType name="DeleteObjectRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="objectId" type="GenericObjectID"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="GenericObjectStatus">
+		<xs:sequence></xs:sequence>
+	</xs:complexType>
+	
+	<xs:complexType name="DeleteObjectRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectId" type="GenericObjectID"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="DeleteObjectResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="DeleteObjectResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="ListObjectsOfTypeRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="objectType" type="GenericObjectType"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="ListObjectsOfTypeRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="objectType" type="GenericObjectType"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="ListObjectsOfTypeResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="listOfObjects" type="ListOfGenericObjectIDs"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+	<xs:complexType name="ListObjectsOfTypeResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"></xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-  <xs:complexType name="ListOfGenericObjectIDs">
-    <xs:sequence>
-      <xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
+	<xs:complexType name="ListOfGenericObjectIDs">
+		<xs:sequence>
+			<xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	
 </xs:schema>
-- 
GitLab


From 479fec4e5739b0f704029fb3404dc70e4a6e2a80 Mon Sep 17 00:00:00 2001
From: markc <markc@tencastle.com>
Date: Wed, 20 Oct 2021 08:51:22 +0200
Subject: [PATCH 5/7] Changing "UpdateObjectResponse" to "ModifyObjectResponse"

---
 103221-1/TS_103_221_01.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index c253a0e..241256b 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -843,7 +843,7 @@
 		</xs:complexContent>
 	</xs:complexType>
 
-	<xs:complexType name="UpdateObjectResponse">
+	<xs:complexType name="ModifyObjectResponse">
 		<xs:complexContent>
 			<xs:extension base="X1ResponseMessage">
 				<xs:sequence>
-- 
GitLab


From 6ec63f83089c64b1ee7e02c39ba06a7af4929ed6 Mon Sep 17 00:00:00 2001
From: markc <markc@tencastle.com>
Date: Wed, 20 Oct 2021 08:52:00 +0200
Subject: [PATCH 6/7] Correcting RequestMessageType

---
 103221-1/TS_103_221_01.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 241256b..82e0492 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -102,7 +102,7 @@
 			<xs:enumeration value="Ping"/>
 			<xs:enumeration value="Keepalive"/>
 			<xs:enumeration value="CreateObject"/>
-			<xs:enumeration value="UpdateObject"/>
+			<xs:enumeration value="ModifyObject"/>
 			<xs:enumeration value="GetObject"/>
 			<xs:enumeration value="DeleteObject"/>
 			<xs:enumeration value="ListObjectsOfType"/>
-- 
GitLab


From 9c55a97c5e1a9e89442a954d447bc0fd41d879ed Mon Sep 17 00:00:00 2001
From: markc <markc@tencastle.com>
Date: Fri, 22 Oct 2021 14:16:39 +0200
Subject: [PATCH 7/7] TS 103 221-1 CR028 - Hashed Identifiers

---
 103221-1/TS_103_221_01.xsd                   | 11 ++++-
 103221-1/TS_103_221_01_HashedID.xsd          | 45 ++++++++++++++++++++
 103221-1/examples/CreateHashedID_example.xml | 38 +++++++++++++++++
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 103221-1/TS_103_221_01_HashedID.xsd
 create mode 100644 103221-1/examples/CreateHashedID_example.xml

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 82e0492..3752f66 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.8.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns="http://uri.etsi.org/03221/X1/2017/10" 
+           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
+           xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+           targetNamespace="http://uri.etsi.org/03221/X1/2017/10" 
+           elementFormDefault="qualified" 
+           version="1.8.1">
+  
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
 	<!-- Message containers -->
 	<xs:element name="X1Request" type="RequestContainer"/>
 	<xs:element name="X1Response" type="ResponseContainer"/>
@@ -179,6 +187,7 @@
 			<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
 			<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
 			<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
+      <xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"></xs:element>
 			<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
 		</xs:choice>
 	</xs:complexType>
diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd
new file mode 100644
index 0000000..90f961d
--- /dev/null
+++ b/103221-1/TS_103_221_01_HashedID.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" 
+           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" 
+           targetNamespace="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+           elementFormDefault="qualified" version="1.9.1">
+
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+  <!-- Message containers -->
+
+  <xs:complexType name="HashContext">
+    <xs:complexContent>
+      <xs:extension base="x1:GenericObject">
+        <xs:sequence>
+          <xs:element name="hashAlgorithm" type="HashAlgorithm"></xs:element>
+          <xs:element name="salt" type="Salt"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="HashAlgorithm">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="sha-256"/>
+      <xs:enumeration value="sha-512"/>
+      <xs:enumeration value="sha3-512"/>
+    </xs:restriction>
+  </xs:simpleType>
+    
+  <xs:simpleType name="Salt">
+    <xs:restriction base="xs:hexBinary">
+      <xs:minLength value="8"></xs:minLength>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="HashedIdentifier">
+    <xs:sequence>
+      <xs:element name="hashContextID" type="x1:GenericObjectID"></xs:element>
+      <xs:element name="targetIdentityType" type="etsi103280:ShortString"></xs:element>
+      <xs:element name="hashDigest" type="xs:hexBinary"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/103221-1/examples/CreateHashedID_example.xml b/103221-1/examples/CreateHashedID_example.xml
new file mode 100644
index 0000000..89dea20
--- /dev/null
+++ b/103221-1/examples/CreateHashedID_example.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID">
+  <x1RequestMessage xsi:type="CreateObjectRequest">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.9.1</version>
+    <x1TransactionId>f9138c05-f82e-4cf4-a1ae-ae92fed2d564</x1TransactionId>
+    <createObject xsi:type="hashedID:HashContext">
+      <objectId>30fbde5e-3195-4a22-b3e9-15e1d60d0528</objectId>
+      <hashedID:hashAlgorithm>sha-256</hashedID:hashAlgorithm>
+      <hashedID:salt>4241792fc4d3d097</hashedID:salt>
+    </createObject>
+  </x1RequestMessage>
+  <x1RequestMessage xsi:type="ActivateTaskRequest">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.9.1</version>
+    <x1TransactionId>f9138c05-f82e-4cf4-a1ae-ae92fed2d565</x1TransactionId>
+    <taskDetails>
+      <xId>30fbde5e-3195-4a22-b3e9-15e1d60d0529</xId>
+      <targetIdentifiers>
+        <targetIdentifier>
+          <hashedIdentifier>
+            <hashedID:hashContextID>30fbde5e-3195-4a22-b3e9-15e1d60d0528</hashedID:hashContextID>
+            <hashedID:targetIdentityType>InternationalE164</hashedID:targetIdentityType>
+            <hashedID:hashDigest>303e57c6968f308a6a7df0ef48c0e21580bc29ae2ed1bd8e5466eb42e72cc39a</hashedID:hashDigest>
+          </hashedIdentifier>
+        </targetIdentifier>
+      </targetIdentifiers>
+      <deliveryType>X2andX3</deliveryType>
+      <listOfDIDs></listOfDIDs>      
+    </taskDetails>
+  </x1RequestMessage>
+</X1Request>
-- 
GitLab