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