Merge branch 'cr/TS33128/0218' of forge.3gpp.org:sa3/li-trial into trialmerge/sa93e/1

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd

 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3"
-           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3"
+           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
+           xmlns:common="http://uri.etsi.org/03280/common/2017/07"           
+           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
            elementFormDefault="qualified">
 
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  
   <xs:element name="X1Extensions" type="X1Extension"></xs:element>
   <xs:complexType name="X1Extensions">
     <xs:sequence>
@@ -11,7 +14,7 @@
     </xs:sequence>
   </xs:complexType>
 
-<xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
+  <xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
 <xs:complexType name="PTCLIX1TargetIdentifierExtensions">
     <xs:sequence>
       <xs:element name="PTCLIX1TargetIdentifier" type="PTCLIX1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
@@ -59,16 +62,16 @@
   <xs:complexType name="FSEID">
     <xs:sequence>
       <xs:element name="SEID" type="xs:unsignedLong"></xs:element>
-      <xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
-      <xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
+      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"></xs:element>
+      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"></xs:element>
    </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="FTEID">
     <xs:sequence>
       <xs:element name="TEID" type="xs:unsignedInt"></xs:element>
-      <xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
-      <xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
+      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"></xs:element>
+      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"></xs:element>
    </xs:sequence>
   </xs:complexType>
 
@@ -175,24 +178,12 @@
   <xs:complexType name="LILCSClientIPAddress">
     <xs:sequence>
       <xs:choice>
-        <xs:element name="IPv4Address" type="IPv4Address"/>
-        <xs:element name="IPv6Address" type="IPv6Address"/>
+        <xs:element name="IPv4Address" type="common:IPv4Address"/>
+        <xs:element name="IPv6Address" type="common:IPv6Address"/>
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:simpleType name="IPv4Address">
-    <xs:restriction base="xs:token">
-      <xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"/>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="IPv6Address">
-    <xs:restriction base="xs:token">
-      <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
-    </xs:restriction>
-  </xs:simpleType>
-  
   <xs:complexType name="PDHRReportingExtensions">
     <xs:sequence>
       <xs:element name="PDHType" type="PDHType"></xs:element>
@@ -245,4 +236,4 @@
   </xs:simpleType>
 
   <xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>