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] 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