From e168f5da21226f08d861a25be168a7f83d8bc164 Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 7 Jul 2022 13:28:10 +0000
Subject: [PATCH 1/7] see s3i220343

---
 .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 501e60a8..7d8a7289 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -89,6 +89,7 @@
       <xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
       <xs:element name="FiveGSTAIList" type="FiveGSTAIList" minOccurs="0"/>
       <xs:element name="GPSI" type="GPSI" minOccurs="0"/>
+      <xs:elemetn name="NCGIs" type="NCGIs" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -114,7 +115,7 @@
       <xs:element name="PEIMAC" type="common:MACAddress"/>
     </xs:choice>
   </xs:complexType>
-  
+
   <xs:complexType name="FiveGSTAIList">
     <xs:sequence>
       <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>
@@ -129,7 +130,7 @@
       <xs:element name="NID" type="NID" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
-  
+
   <xs:complexType name="GPSI">
     <xs:choice>
       <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>
@@ -137,6 +138,34 @@
     </xs:choice>
   </xs:complexType>
 
+  <xs:complexType name="NCGIs">
+    <xs:sequence>
+      <xs:element name="NCGI" type="NCGI" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="NCGI">
+    <xs:sequence>
+      <xs:element name="PLMNID" type="PLMNID"/>
+      <xs:element name="NRCellID" type="NRCellID"/>
+      <xs:element name="NID" type="NID" minOccurs="0"/>
+      <xs:element name="NCGI Time" type="common:QualifiedMicrosecondDateTime"/> minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PLMNID">
+    <xs:sequence>
+      <xs:element name="MCC" type="MCC"/>
+      <xs:element name="MNC" type="MNC"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="NRCellID">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([A-Fa-f0-9]{9}"></xs:pattern>
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:simpleType name="MCC">
     <xs:restriction base="xs:string">
       <xs:pattern value="[0-9]{3}"></xs:pattern>
@@ -225,4 +254,4 @@
     </xs:complexContent>
   </xs:complexType>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
-- 
GitLab


From a79d6be393f46de86a432eff8ee9fe5c39cc630f Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 7 Jul 2022 13:32:10 +0000
Subject: [PATCH 2/7] Update
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 7d8a7289..afd8a436 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -89,7 +89,7 @@
       <xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
       <xs:element name="FiveGSTAIList" type="FiveGSTAIList" minOccurs="0"/>
       <xs:element name="GPSI" type="GPSI" minOccurs="0"/>
-      <xs:elemetn name="NCGIs" type="NCGIs" minOccurs="0"/>
+      <xs:element name="NCGIs" type="NCGIs" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -162,7 +162,7 @@
 
   <xs:simpleType name="NRCellID">
     <xs:restriction base="xs:string">
-      <xs:pattern value="([A-Fa-f0-9]{9}"></xs:pattern>
+      <xs:pattern value="([A-Fa-f0-9]{9})"></xs:pattern>
     </xs:restriction>
   </xs:simpleType>
 
-- 
GitLab


From 2a24b011ebd774d344c0fc3a8d2dd794595b87bf Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 7 Jul 2022 13:34:58 +0000
Subject: [PATCH 3/7] Update
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index afd8a436..50077ef7 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -149,7 +149,7 @@
       <xs:element name="PLMNID" type="PLMNID"/>
       <xs:element name="NRCellID" type="NRCellID"/>
       <xs:element name="NID" type="NID" minOccurs="0"/>
-      <xs:element name="NCGI Time" type="common:QualifiedMicrosecondDateTime"/> minOccurs="0"/>
+      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/> minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-- 
GitLab


From c94173b9bb9fb3ca674acaed893821f551f7494e Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 7 Jul 2022 13:39:19 +0000
Subject: [PATCH 4/7] Update
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 50077ef7..486e9bdc 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -149,7 +149,7 @@
       <xs:element name="PLMNID" type="PLMNID"/>
       <xs:element name="NRCellID" type="NRCellID"/>
       <xs:element name="NID" type="NID" minOccurs="0"/>
-      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/> minOccurs="0"/>
+      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-- 
GitLab


From 4aff052293826f86eab9dc8909ea48e3256152cc Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 14 Jul 2022 13:12:00 +0000
Subject: [PATCH 5/7] Corrections

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 486e9bdc..2835d389 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -89,7 +89,7 @@
       <xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
       <xs:element name="FiveGSTAIList" type="FiveGSTAIList" minOccurs="0"/>
       <xs:element name="GPSI" type="GPSI" minOccurs="0"/>
-      <xs:element name="NCGIs" type="NCGIs" minOccurs="0"/>
+      <xs:element name="NCGI" type="NCGI" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -138,7 +138,7 @@
     </xs:choice>
   </xs:complexType>
 
-  <xs:complexType name="NCGIs">
+  <xs:complexType name="NCGI">
     <xs:sequence>
       <xs:element name="NCGI" type="NCGI" maxOccurs="unbounded"/>
     </xs:sequence>
@@ -149,7 +149,7 @@
       <xs:element name="PLMNID" type="PLMNID"/>
       <xs:element name="NRCellID" type="NRCellID"/>
       <xs:element name="NID" type="NID" minOccurs="0"/>
-      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
+      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime">
     </xs:sequence>
   </xs:complexType>
 
-- 
GitLab


From 61d59137f4b71d4531f35facf7cc48cc1acb9656 Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 14 Jul 2022 13:14:29 +0000
Subject: [PATCH 6/7] Update
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 2835d389..2c7fbdbc 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -149,7 +149,7 @@
       <xs:element name="PLMNID" type="PLMNID"/>
       <xs:element name="NRCellID" type="NRCellID"/>
       <xs:element name="NID" type="NID" minOccurs="0"/>
-      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime">
+      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/>
     </xs:sequence>
   </xs:complexType>
 
-- 
GitLab


From 3e6fe61e27325afb95affceb84f48eaf64e9cc8b Mon Sep 17 00:00:00 2001
From: hawbaker <tyler.hawbaker@trideaworks.com>
Date: Thu, 14 Jul 2022 13:18:07 +0000
Subject: [PATCH 7/7] Update
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

---
 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 2c7fbdbc..1f64454e 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -138,12 +138,6 @@
     </xs:choice>
   </xs:complexType>
 
-  <xs:complexType name="NCGI">
-    <xs:sequence>
-      <xs:element name="NCGI" type="NCGI" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="NCGI">
     <xs:sequence>
       <xs:element name="PLMNID" type="PLMNID"/>
-- 
GitLab