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/3] 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/3] 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 7f50c3bdbec91797a821611ca025923c5b0a4981 Mon Sep 17 00:00:00 2001
From: markc <markc@tencastle.com>
Date: Mon, 11 Oct 2021 08:25:36 +0200
Subject: [PATCH 3/3] Re-indenting RequestMessageType

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

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 0dab420..71488de 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -101,11 +101,11 @@
 			<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: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">
-- 
GitLab