From 05fba37ea3d3db4a70ca8c143d18f6f7c7c16f6d Mon Sep 17 00:00:00 2001
From: Brendan Hassett <brendan.t.hassett@huawei.com>
Date: Fri, 1 Oct 2021 10:58:57 +0200
Subject: [PATCH 01/49] S5-215263 Update genericNrm.yaml

---
 OpenAPI/genericNrm.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index 0911920a2..b4712edfd 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1210,6 +1210,10 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/MnsRegistry'
+        MnsRegistry:
+          type: array
+          items:
+            $ref: '#/components/schemas/MnsRegistry'
     ManagedElement-ncO:
       type: object
       properties:
@@ -1353,6 +1357,11 @@ components:
           type: string
         mnsType:
           type: string
+          enum:
+            - ProvMnS
+            - FaultSupervisionMnS
+            - StreamingDataReportingMnS
+            - FileDataReportingMnS
         mnsVersion:
           type: string
         mnsAddress:
-- 
GitLab


From 9217760115c8db26679a09b2adfbac05cd96acc3 Mon Sep 17 00:00:00 2001
From: Brendan Hassett <brendan.t.hassett@huawei.com>
Date: Fri, 1 Oct 2021 10:59:48 +0200
Subject: [PATCH 02/49] S5-215263 Update genericNrm.yaml

---
 OpenAPI/genericNrm.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index b4712edfd..2b46aa48c 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1210,10 +1210,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/MnsRegistry'
-        MnsRegistry:
-          type: array
-          items:
-            $ref: '#/components/schemas/MnsRegistry'
     ManagedElement-ncO:
       type: object
       properties:
-- 
GitLab


From d5ae0af16496bff952da90eb587aa2d776dc1acd Mon Sep 17 00:00:00 2001
From: Brendan Hassett <brendan.t.hassett@huawei.com>
Date: Fri, 1 Oct 2021 11:02:22 +0200
Subject: [PATCH 03/49] S5-215263 Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 2783fd385..5471937f0 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -28,9 +28,10 @@ module _3gpp-common-mnsregistry {
     leaf mnsType {
       description "Type of management service.";
       type enumeration {
-         enum PROVISIONING;
-         enum FAULT_SUPERVISION; 
-         enum PERFORMANCE_ASSURANCE;
+         enum ProvMnS;
+         enum FaultSupervisionMnS;
+         enum StreamingDataReportingMnS;
+         enum FileDataReportingMnS;
       }
     }
     
-- 
GitLab


From 43753f6a78787bc80446af1c55d0a47231c1c464 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:23:40 +0200
Subject: [PATCH 04/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 5471937f0..9489507ae 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -14,11 +14,7 @@ module _3gpp-common-mnsregistry {
 
   revision 2021-08-29 { reference "Initial revision, S5-214388"; }
 
-  grouping MNSRegistryGrp {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.541";
-    uses top3gpp:Top_Grp;
-    
+  grouping MNSInfoGrp {
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
@@ -45,6 +41,14 @@ module _3gpp-common-mnsregistry {
       mandatory true;
       type string;
     }    
+  
+  }
+  
+  grouping MNSRegistryGrp {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.541";
+    uses top3gpp:Top_Grp;
+    uses MNSInfoGrp;
     }
     
     augment "/subnet3gpp:SubNetwork" {
-- 
GitLab


From a33c92748d9a9c338aa809f1102947140bd9e34e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:41:57 +0200
Subject: [PATCH 05/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 9489507ae..719d8bfd6 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -29,7 +29,6 @@ module _3gpp-common-mnsregistry {
          enum StreamingDataReportingMnS;
          enum FileDataReportingMnS;
       }
-    }
     
     leaf mnsVersion {
       description "Version of management service.";
@@ -44,11 +43,23 @@ module _3gpp-common-mnsregistry {
   
   }
   
+  augment "/subnet3gpp:SubNetwork" {
+  list MNSInfo {
+    description "Represents the MNSInfo IOC.";
+    key id;   
+    uses top3gpp:Top_Grp;      
+    container attributes {
+      uses MNSInfoGrp;
+    }
+  }
+
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.541";
     uses top3gpp:Top_Grp;
-    uses MNSInfoGrp;
+    container attributes {
+       uses MNSInfoGrp;
+    };
     }
     
     augment "/subnet3gpp:SubNetwork" {
@@ -60,5 +71,6 @@ module _3gpp-common-mnsregistry {
         uses MNSRegistryGrp;
       }
     }
+    }
  }
 }
\ No newline at end of file
-- 
GitLab


From d9eb9e2005483fa2cb17ddaed6c00198ad424686 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:47:18 +0200
Subject: [PATCH 06/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 719d8bfd6..14b220ec8 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -15,6 +15,8 @@ module _3gpp-common-mnsregistry {
   revision 2021-08-29 { reference "Initial revision, S5-214388"; }
 
   grouping MNSInfoGrp {
+    description "Represents the MNSInfo IOC.";
+    reference "3GPP TS 28.622";
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
@@ -43,19 +45,19 @@ module _3gpp-common-mnsregistry {
   
   }
   
-  augment "/subnet3gpp:SubNetwork" {
-  list MNSInfo {
-    description "Represents the MNSInfo IOC.";
-    key id;   
-    uses top3gpp:Top_Grp;      
-    container attributes {
-      uses MNSInfoGrp;
-    }
-  }
+    augment "mnsregist3gpp:MNSRegistry" {
+    list MNSInfo {
+      description "Represents the MNSInfo IOC.";
+      key id;   
+      uses top3gpp:Top_Grp;      
+      container attributes {
+        uses MNSInfoGrp;
+      }
+    }  
 
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.541";
+    reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
     container attributes {
        uses MNSInfoGrp;
-- 
GitLab


From b304c3c4c29dd5fea83a24f8e6ea953e18a390e1 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:47:55 +0200
Subject: [PATCH 07/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 14b220ec8..d3e59ac3d 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -61,7 +61,7 @@ module _3gpp-common-mnsregistry {
     uses top3gpp:Top_Grp;
     container attributes {
        uses MNSInfoGrp;
-    };
+    }
     }
     
     augment "/subnet3gpp:SubNetwork" {
-- 
GitLab


From 6219915a55ea9a8cd916af023e746456657cb9fc Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:50:23 +0200
Subject: [PATCH 08/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index d3e59ac3d..60f82942c 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -42,7 +42,6 @@ module _3gpp-common-mnsregistry {
       mandatory true;
       type string;
     }    
-  
   }
   
     augment "mnsregist3gpp:MNSRegistry" {
@@ -54,6 +53,7 @@ module _3gpp-common-mnsregistry {
         uses MNSInfoGrp;
       }
     }  
+    }
 
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
-- 
GitLab


From 07bfccb25695e8f1c70fe562ca0352020f442c4d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 14:57:29 +0200
Subject: [PATCH 09/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 40 +++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 60f82942c..0e7166c8e 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -43,17 +43,6 @@ module _3gpp-common-mnsregistry {
       type string;
     }    
   }
-  
-    augment "mnsregist3gpp:MNSRegistry" {
-    list MNSInfo {
-      description "Represents the MNSInfo IOC.";
-      key id;   
-      uses top3gpp:Top_Grp;      
-      container attributes {
-        uses MNSInfoGrp;
-      }
-    }  
-    }
 
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
@@ -62,17 +51,26 @@ module _3gpp-common-mnsregistry {
     container attributes {
        uses MNSInfoGrp;
     }
-    }
+  }
     
-    augment "/subnet3gpp:SubNetwork" {
-    list MNSRegistry {
-      description "Represents the MNSRegistry IOC.";
-      key id;   
-      uses top3gpp:Top_Grp;      
-      container attributes {
-        uses MNSRegistryGrp;
-      }
-    }
+  augment "mnsregist3gpp:MNSRegistry" {
+  list MNSInfo {
+    description "Represents the MNSInfo IOC.";
+    key id;   
+    uses top3gpp:Top_Grp;      
+    container attributes {
+      uses MNSInfoGrp;
     }
+  }  
+  
+  augment "/subnet3gpp:SubNetwork" {
+    description "Represents the MNSRegistry IOC.";
+    key id;   
+    uses top3gpp:Top_Grp;      
+    container attributes {
+      uses MNSRegistryGrp;
+  }
  }
+ 
+ 
 }
\ No newline at end of file
-- 
GitLab


From f766d12648ce8149417b93663c133dd29d098a3b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 15:02:31 +0200
Subject: [PATCH 10/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 0e7166c8e..f5a68fa30 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -62,6 +62,7 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGrp;
     }
   }  
+  }
   
   augment "/subnet3gpp:SubNetwork" {
     description "Represents the MNSRegistry IOC.";
@@ -69,8 +70,6 @@ module _3gpp-common-mnsregistry {
     uses top3gpp:Top_Grp;      
     container attributes {
       uses MNSRegistryGrp;
+    }
   }
- }
- 
- 
 }
\ No newline at end of file
-- 
GitLab


From 8bdb0010c6fdabda75d903e9e93e5f61aeebba47 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 15:55:18 +0200
Subject: [PATCH 11/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f5a68fa30..1585140a9 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -31,6 +31,7 @@ module _3gpp-common-mnsregistry {
          enum StreamingDataReportingMnS;
          enum FileDataReportingMnS;
       }
+    }
     
     leaf mnsVersion {
       description "Version of management service.";
-- 
GitLab


From 3e3b1724f8881a033394c52d105da3ee82bd18e9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:02:01 +0200
Subject: [PATCH 12/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 1585140a9..2af524bf0 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -54,7 +54,7 @@ module _3gpp-common-mnsregistry {
     }
   }
     
-  augment "mnsregist3gpp:MNSRegistry" {
+  augment "/mnsregist3gpp:MNSRegistry" {
   list MNSInfo {
     description "Represents the MNSInfo IOC.";
     key id;   
@@ -67,10 +67,6 @@ module _3gpp-common-mnsregistry {
   
   augment "/subnet3gpp:SubNetwork" {
     description "Represents the MNSRegistry IOC.";
-    key id;   
-    uses top3gpp:Top_Grp;      
-    container attributes {
-      uses MNSRegistryGrp;
-    }
+    uses top3gpp:Top_Grp;
   }
 }
\ No newline at end of file
-- 
GitLab


From 3ba896c6e9b4523776bca904332ea6fdbe775946 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:04:23 +0200
Subject: [PATCH 13/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 2af524bf0..e36b8cb41 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -53,7 +53,8 @@ module _3gpp-common-mnsregistry {
        uses MNSInfoGrp;
     }
   }
-    
+  }
+  
   augment "/mnsregist3gpp:MNSRegistry" {
   list MNSInfo {
     description "Represents the MNSInfo IOC.";
@@ -63,8 +64,6 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGrp;
     }
   }  
-  }
-  
   augment "/subnet3gpp:SubNetwork" {
     description "Represents the MNSRegistry IOC.";
     uses top3gpp:Top_Grp;
-- 
GitLab


From b444d79b03a8d6570c1c50520fd4c82e760efa61 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:10:46 +0200
Subject: [PATCH 14/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index e36b8cb41..dfc756948 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -64,8 +64,11 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGrp;
     }
   }  
+  }
+  
   augment "/subnet3gpp:SubNetwork" {
     description "Represents the MNSRegistry IOC.";
     uses top3gpp:Top_Grp;
   }
+ 
 }
\ No newline at end of file
-- 
GitLab


From a992bc8afd0b8409c2bb59f6c10c8dcabedf56b0 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:13:12 +0200
Subject: [PATCH 15/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index dfc756948..f8c6ec145 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -53,7 +53,6 @@ module _3gpp-common-mnsregistry {
        uses MNSInfoGrp;
     }
   }
-  }
   
   augment "/mnsregist3gpp:MNSRegistry" {
   list MNSInfo {
-- 
GitLab


From 57c72bda362d1747f8e262b6b0040db5c31d2dd6 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:47:18 +0200
Subject: [PATCH 16/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f8c6ec145..adce96bb4 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -53,21 +53,27 @@ module _3gpp-common-mnsregistry {
        uses MNSInfoGrp;
     }
   }
-  
+ 
   augment "/mnsregist3gpp:MNSRegistry" {
-  list MNSInfo {
-    description "Represents the MNSInfo IOC.";
-    key id;   
-    uses top3gpp:Top_Grp;      
-    container attributes {
-      uses MNSInfoGrp;
+    list MNSInfo {
+      description "Represents the MNS Registry.";
+      reference "3GPP TS 28.622";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MNSInfoGrp;
+      }
     }
-  }  
   }
-  
+
   augment "/subnet3gpp:SubNetwork" {
-    description "Represents the MNSRegistry IOC.";
+    description "Represents the MNS Registry IOC.";
+    reference "3GPP TS 28.622";
+    key id;
     uses top3gpp:Top_Grp;
-  }
- 
+    container attributes {
+      uses MNSRegistryGrp;
+    }
+    }
+
 }
\ No newline at end of file
-- 
GitLab


From 2a661b04cd4a4786f0e329646a597f86424a505d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:48:59 +0200
Subject: [PATCH 17/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index adce96bb4..fe778553d 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -71,9 +71,7 @@ module _3gpp-common-mnsregistry {
     reference "3GPP TS 28.622";
     key id;
     uses top3gpp:Top_Grp;
-    container attributes {
-      uses MNSRegistryGrp;
-    }
+    uses MNSRegistryGrp;
     }
 
 }
\ No newline at end of file
-- 
GitLab


From c0b21f74f693c62b67a304f7bec39cf35be0c145 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:51:56 +0200
Subject: [PATCH 18/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 --
 1 file changed, 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index fe778553d..1ac406b73 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -69,8 +69,6 @@ module _3gpp-common-mnsregistry {
   augment "/subnet3gpp:SubNetwork" {
     description "Represents the MNS Registry IOC.";
     reference "3GPP TS 28.622";
-    key id;
-    uses top3gpp:Top_Grp;
     uses MNSRegistryGrp;
     }
 
-- 
GitLab


From e27b56221a54b00c2b9fb3df844450a17a07f48c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:55:24 +0200
Subject: [PATCH 19/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 1ac406b73..18387a8e2 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -46,24 +46,21 @@ module _3gpp-common-mnsregistry {
   }
 
   grouping MNSRegistryGrp {
+    list MNSInfo {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
+    key id;
     uses top3gpp:Top_Grp;
     container attributes {
        uses MNSInfoGrp;
     }
+    }
   }
  
-  augment "/mnsregist3gpp:MNSRegistry" {
-    list MNSInfo {
-      description "Represents the MNS Registry.";
-      reference "3GPP TS 28.622";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses MNSInfoGrp;
-      }
-    }
+  augment "/mnsregist3gpp:MNSRegistryGrp" {
+    description "Represents the MNS Registry.";
+    reference "3GPP TS 28.622";
+    uses MNSInfoGrp;
   }
 
   augment "/subnet3gpp:SubNetwork" {
-- 
GitLab


From c947d37e6d5a665792244bd1ec55ebc0f5292c1b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:58:25 +0200
Subject: [PATCH 20/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 18387a8e2..64cbd0e67 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,19 +45,19 @@ module _3gpp-common-mnsregistry {
     }    
   }
 
-  grouping MNSRegistryGrp {
+  grouping MNSRegistry {
     list MNSInfo {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.622";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-       uses MNSInfoGrp;
-    }
+      description "Represents the MNSRegistry IOC.";
+      reference "3GPP TS 28.622";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MNSInfoGrp;
+      }
     }
   }
  
-  augment "/mnsregist3gpp:MNSRegistryGrp" {
+  augment "/mnsregist3gpp:MNSRegistry" {
     description "Represents the MNS Registry.";
     reference "3GPP TS 28.622";
     uses MNSInfoGrp;
-- 
GitLab


From cb4ab0eaaf1bcd9f42c066b17a0b842a772dd983 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 16:59:54 +0200
Subject: [PATCH 21/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 64cbd0e67..a28997d3d 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,7 +45,7 @@ module _3gpp-common-mnsregistry {
     }    
   }
 
-  grouping MNSRegistry {
+  grouping MNSRegistryGrp {
     list MNSInfo {
       description "Represents the MNSRegistry IOC.";
       reference "3GPP TS 28.622";
@@ -57,7 +57,7 @@ module _3gpp-common-mnsregistry {
     }
   }
  
-  augment "/mnsregist3gpp:MNSRegistry" {
+  augment "/mnsregist3gpp:MNSRegistryGrp" {
     description "Represents the MNS Registry.";
     reference "3GPP TS 28.622";
     uses MNSInfoGrp;
-- 
GitLab


From a1573793bedb0c15e89181477886e2098656f23d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:05:46 +0200
Subject: [PATCH 22/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index a28997d3d..f1a3c5e84 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -46,27 +46,21 @@ module _3gpp-common-mnsregistry {
   }
 
   grouping MNSRegistryGrp {
-    list MNSInfo {
-      description "Represents the MNSRegistry IOC.";
-      reference "3GPP TS 28.622";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses MNSInfoGrp;
-      }
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.622";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses MNSInfoGrp;
     }
   }
  
   augment "/mnsregist3gpp:MNSRegistryGrp" {
-    description "Represents the MNS Registry.";
-    reference "3GPP TS 28.622";
     uses MNSInfoGrp;
   }
 
   augment "/subnet3gpp:SubNetwork" {
-    description "Represents the MNS Registry IOC.";
-    reference "3GPP TS 28.622";
     uses MNSRegistryGrp;
-    }
+  }
 
 }
\ No newline at end of file
-- 
GitLab


From 513268203c5811e8e064ec63755a7d8658c6d039 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:08:25 +0200
Subject: [PATCH 23/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f1a3c5e84..bbb3db917 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,7 +45,7 @@ module _3gpp-common-mnsregistry {
     }    
   }
 
-  grouping MNSRegistryGrp {
+  grouping MNSInfo {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     key id;
@@ -54,6 +54,17 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGrp;
     }
   }
+  
+  grouping MNSRegistryGrp {
+    list MNSInfo {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.622";
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses MNSInfo;
+    }
+    }
+  }
  
   augment "/mnsregist3gpp:MNSRegistryGrp" {
     uses MNSInfoGrp;
-- 
GitLab


From 1fa8825079cd7eaa6833e611e0d8d4dc6c08d0a5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:14:39 +0200
Subject: [PATCH 24/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 24 +++++------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index bbb3db917..5fda6eaca 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,33 +45,19 @@ module _3gpp-common-mnsregistry {
     }    
   }
 
-  grouping MNSInfo {
+  grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
-    key id;
     uses top3gpp:Top_Grp;
-    container attributes {
-      uses MNSInfoGrp;
-    }
-  }
-  
-  grouping MNSRegistryGrp {
     list MNSInfo {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.622";
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses MNSInfo;
+      uses MNSInfoGroup;
+      key "mnsType mnsVersion";
     }
     }
   }
- 
-  augment "/mnsregist3gpp:MNSRegistryGrp" {
-    uses MNSInfoGrp;
-  }
-
+  
   augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistryGrp;
+    uses MNSRegistry;
   }
 
 }
\ No newline at end of file
-- 
GitLab


From 98957bb6946e119d29194806664bb7a5fb019074 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:21:02 +0200
Subject: [PATCH 25/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 5fda6eaca..3d61c6b06 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,19 +45,29 @@ module _3gpp-common-mnsregistry {
     }    
   }
 
-  grouping MNSRegistry {
-    description "Represents the MNSRegistry IOC.";
+  grouping MNSInfo {
+    list MNSInfo {
+    description "Represents the MNSInfo IOC.";
     reference "3GPP TS 28.622";
+    key "mnsType mnsVersion";
     uses top3gpp:Top_Grp;
-    list MNSInfo {
+    container attributes {
       uses MNSInfoGroup;
-      key "mnsType mnsVersion";
+      }
     }
+    
+  grouping MNSRegistry {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.622";
+    uses top3gpp:Top_Grp;
     }
-  }
   
   augment "/subnet3gpp:SubNetwork" {
     uses MNSRegistry;
   }
+  
+  augment "/mnsregist3gpp:MNSRegistry" {
+    uses MNSInfo;
+  }
 
 }
\ No newline at end of file
-- 
GitLab


From 37c0e7ae556ba528709a2e6f949ba953952ff910 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:22:13 +0200
Subject: [PATCH 26/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 3d61c6b06..c8ffbdbb5 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -55,6 +55,7 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGroup;
       }
     }
+  }
     
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
-- 
GitLab


From 56e03099bbb8fd48cc0a778414c2f998e95aa02d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:25:02 +0200
Subject: [PATCH 27/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 26 ++++++++++-------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index c8ffbdbb5..5553f6c0d 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -44,19 +44,7 @@ module _3gpp-common-mnsregistry {
       type string;
     }    
   }
-
-  grouping MNSInfo {
-    list MNSInfo {
-    description "Represents the MNSInfo IOC.";
-    reference "3GPP TS 28.622";
-    key "mnsType mnsVersion";
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses MNSInfoGroup;
-      }
-    }
-  }
-    
+  
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
@@ -68,7 +56,15 @@ module _3gpp-common-mnsregistry {
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
-    uses MNSInfo;
+    list MNSInfo {
+    description "Represents the MNSInfo IOC.";
+    reference "3GPP TS 28.622";
+    key "mnsType mnsVersion";
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses MNSInfoGroup;
+      }
+    }
   }
-
+  
 }
\ No newline at end of file
-- 
GitLab


From 732b5e37c43088767743624b1b04ce3952784b69 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:33:15 +0200
Subject: [PATCH 28/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 29 ++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 5553f6c0d..fa6887fa7 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -45,26 +45,39 @@ module _3gpp-common-mnsregistry {
     }    
   }
   
+  grouping MNSInfo {
+    description "Represents the MNSInfo IOC.";
+    reference "3GPP TS 28.622";
+    uses top3gpp:Top_Grp;
+    key "mnsType mnsVersion mnsAddress";
+    container attributes {
+      uses MNSInfoGrp;
+    }
+  }
+
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
-    }
-  
-  augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistry;
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
     list MNSInfo {
-    description "Represents the MNSInfo IOC.";
+    description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
-    key "mnsType mnsVersion";
     uses top3gpp:Top_Grp;
     container attributes {
-      uses MNSInfoGroup;
-      }
+      uses MNSInfo;
     }
+    }
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    uses MNSRegistry;
+  }
+  
+  augment "/mnsregist3gpp:MNSRegistry" {
+      uses MNSInfo;
   }
   
 }
\ No newline at end of file
-- 
GitLab


From d0e06bca5f9af0b08c6cffa96c962c77f0ab2c5b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:36:11 +0200
Subject: [PATCH 29/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index fa6887fa7..65f2366b1 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -49,7 +49,6 @@ module _3gpp-common-mnsregistry {
     description "Represents the MNSInfo IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
-    key "mnsType mnsVersion mnsAddress";
     container attributes {
       uses MNSInfoGrp;
     }
@@ -62,13 +61,12 @@ module _3gpp-common-mnsregistry {
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
-    list MNSInfo {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
-    container attributes {
+    list MNSInfo {
       uses MNSInfo;
-    }
+      key "mnsType mnsVersion mnsAddress";
     }
   }
   
-- 
GitLab


From aa535cf4c2aa885a432948d259e3252fecbd9568 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:40:08 +0200
Subject: [PATCH 30/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 65f2366b1..3d7dce15c 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -54,12 +54,22 @@ module _3gpp-common-mnsregistry {
     }
   }
 
+  grouping MNSRegistryGrp {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.622";
+    uses top3gpp:Top_Grp;
+  }
+  
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
+    container attributes {
+      uses MNSRegistryGrp;
+    }
   }
   
+  
   augment "/mnsregist3gpp:MNSRegistry" {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
-- 
GitLab


From 8c02491ab8e3c2d33545de4d496d53edc58a6b05 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:46:37 +0200
Subject: [PATCH 31/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 3d7dce15c..684f23277 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -53,30 +53,13 @@ module _3gpp-common-mnsregistry {
       uses MNSInfoGrp;
     }
   }
-
-  grouping MNSRegistryGrp {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.622";
-    uses top3gpp:Top_Grp;
-  }
   
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
     container attributes {
-      uses MNSRegistryGrp;
-    }
-  }
-  
-  
-  augment "/mnsregist3gpp:MNSRegistry" {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.622";
-    uses top3gpp:Top_Grp;
-    list MNSInfo {
       uses MNSInfo;
-      key "mnsType mnsVersion mnsAddress";
     }
   }
   
-- 
GitLab


From a8250ac1c52e52640ec0ba9cdc0ff8347c60d7ff Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:49:54 +0200
Subject: [PATCH 32/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 684f23277..2db2da6c4 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -54,7 +54,7 @@ module _3gpp-common-mnsregistry {
     }
   }
   
-  grouping MNSRegistry {
+  grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
@@ -63,6 +63,14 @@ module _3gpp-common-mnsregistry {
     }
   }
   
+  grouping MNSRegistry {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.622";
+    uses top3gpp:Top_Grp;
+    uses MNSRegistryGrp;
+  }
+  
+  
   augment "/subnet3gpp:SubNetwork" {
     uses MNSRegistry;
   }
-- 
GitLab


From 9046bef22da6b569269941d048178b41b427f5b8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:51:48 +0200
Subject: [PATCH 33/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 2db2da6c4..fa6bfea3a 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -72,11 +72,11 @@ module _3gpp-common-mnsregistry {
   
   
   augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistry;
+    uses MNSRegistryGrp;
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
-      uses MNSInfo;
+      uses MNSInfoGrp;
   }
   
 }
\ No newline at end of file
-- 
GitLab


From 0167c6823e53bdc964abfbd86dae92e1e8ba0fa3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:57:25 +0200
Subject: [PATCH 34/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index fa6bfea3a..221181eef 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -66,7 +66,6 @@ module _3gpp-common-mnsregistry {
   grouping MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
-    uses top3gpp:Top_Grp;
     uses MNSRegistryGrp;
   }
   
-- 
GitLab


From 059f8c8c1b3e6324eb8025576d739f92ce5fe15b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 17:59:18 +0200
Subject: [PATCH 35/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 221181eef..9bdef8c8e 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -71,11 +71,11 @@ module _3gpp-common-mnsregistry {
   
   
   augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistryGrp;
+    uses MNSRegistry;
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
-      uses MNSInfoGrp;
+      uses MNSInfo;
   }
   
 }
\ No newline at end of file
-- 
GitLab


From 128c18d62b1622da5b66e0e54d3d7f1d7fa9b66a Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:07:22 +0200
Subject: [PATCH 36/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 9bdef8c8e..254968881 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -75,6 +75,14 @@ module _3gpp-common-mnsregistry {
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
+    list MNSInfo {
+     description "Represents the MNS Registry.";
+      reference "3GPP TS 28.622";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses AMFFunctionGrp;
+    }
       uses MNSInfo;
   }
   
-- 
GitLab


From 94c591c13327290ff8a96fffdb81a776e198a49c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:08:42 +0200
Subject: [PATCH 37/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 254968881..1de7de4e5 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -76,14 +76,15 @@ module _3gpp-common-mnsregistry {
   
   augment "/mnsregist3gpp:MNSRegistry" {
     list MNSInfo {
-     description "Represents the MNS Registry.";
-      reference "3GPP TS 28.622";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses AMFFunctionGrp;
+    description "Represents the MNS Registry.";
+    reference "3GPP TS 28.622";
+    key id;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses AMFFunctionGrp;
     }
-      uses MNSInfo;
-  }
+    uses MNSInfo;
+    }
+   }
   
 }
\ No newline at end of file
-- 
GitLab


From 09ee7bc225410e49a0732b1b3c69e1af9a9b1790 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:12:36 +0200
Subject: [PATCH 38/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 1de7de4e5..f8205b55b 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -64,9 +64,14 @@ module _3gpp-common-mnsregistry {
   }
   
   grouping MNSRegistry {
+    list MNSInfo {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
-    uses MNSRegistryGrp;
+    uses top3gpp:Top_Grp;
+    container attributes {
+      uses MNSRegistryGrp;
+      key "mnsType mnsVersion mnsAddress";
+    }
   }
   
   
@@ -75,16 +80,7 @@ module _3gpp-common-mnsregistry {
   }
   
   augment "/mnsregist3gpp:MNSRegistry" {
-    list MNSInfo {
-    description "Represents the MNS Registry.";
-    reference "3GPP TS 28.622";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses AMFFunctionGrp;
-    }
     uses MNSInfo;
-    }
    }
   
 }
\ No newline at end of file
-- 
GitLab


From be2df06f18cf15923847aa8b0141bfb2a2c7667a Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:13:40 +0200
Subject: [PATCH 39/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f8205b55b..bdb694c90 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -73,7 +73,7 @@ module _3gpp-common-mnsregistry {
       key "mnsType mnsVersion mnsAddress";
     }
   }
-  
+  }
   
   augment "/subnet3gpp:SubNetwork" {
     uses MNSRegistry;
-- 
GitLab


From a3e77ca00861dd443ad29e4ee43d990f3fa946c9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:15:43 +0200
Subject: [PATCH 40/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index bdb694c90..ba0365739 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -68,9 +68,9 @@ module _3gpp-common-mnsregistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
+    key "mnsType mnsVersion mnsAddress";
     container attributes {
       uses MNSRegistryGrp;
-      key "mnsType mnsVersion mnsAddress";
     }
   }
   }
-- 
GitLab


From 39ecd3f4cfcdf98439e64eeac14d1ec7fe75c9a4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:18:35 +0200
Subject: [PATCH 41/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index ba0365739..0b3f08b84 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -64,7 +64,7 @@ module _3gpp-common-mnsregistry {
   }
   
   grouping MNSRegistry {
-    list MNSInfo {
+    list MNSInfoGrp {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
@@ -79,8 +79,8 @@ module _3gpp-common-mnsregistry {
     uses MNSRegistry;
   }
   
-  augment "/mnsregist3gpp:MNSRegistry" {
-    uses MNSInfo;
+  augment "/mnsregist3gpp:MNSRegistryGrp" {
+    uses MNSInfoGrp;
    }
   
 }
\ No newline at end of file
-- 
GitLab


From 7c5fd9dd3830f9df3b187a1a2cf5c3a3917283aa Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:22:15 +0200
Subject: [PATCH 42/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 0b3f08b84..37694f194 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -64,13 +64,13 @@ module _3gpp-common-mnsregistry {
   }
   
   grouping MNSRegistry {
-    list MNSInfoGrp {
+    list MNSRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
     key "mnsType mnsVersion mnsAddress";
     container attributes {
-      uses MNSRegistryGrp;
+      uses MNSInfo;
     }
   }
   }
-- 
GitLab


From 1499743ec1fae646e7b5d46bfb89f3b65dc12b87 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:41:27 +0200
Subject: [PATCH 43/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 37694f194..f712d4cd6 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -58,19 +58,16 @@ module _3gpp-common-mnsregistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
-    container attributes {
-      uses MNSInfo;
-    }
   }
   
   grouping MNSRegistry {
-    list MNSRegistry {
+    list mnsRegistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.622";
     uses top3gpp:Top_Grp;
     key "mnsType mnsVersion mnsAddress";
     container attributes {
-      uses MNSInfo;
+      uses MNSInfoGrp;
     }
   }
   }
-- 
GitLab


From 9210de595f8c1fdced2ca675b073383d8538579d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:43:16 +0200
Subject: [PATCH 44/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f712d4cd6..f3f305021 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -73,10 +73,10 @@ module _3gpp-common-mnsregistry {
   }
   
   augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistry;
+    uses MNSRegistryGrp;
   }
   
-  augment "/mnsregist3gpp:MNSRegistryGrp" {
+  augment "/mnsregist3gpp:MNSRegistry" {
     uses MNSInfoGrp;
    }
   
-- 
GitLab


From 77fb5ebda4c9a9ac03f3fa3c19d129e5ed6146be Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:45:31 +0200
Subject: [PATCH 45/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index f3f305021..3fecd1d18 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -76,7 +76,7 @@ module _3gpp-common-mnsregistry {
     uses MNSRegistryGrp;
   }
   
-  augment "/mnsregist3gpp:MNSRegistry" {
+  augment "/mnsregist3gpp:MNSRegistryGrp" {
     uses MNSInfoGrp;
    }
   
-- 
GitLab


From b2572d4c7daef694eb157a175e447a9f4a519ba9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 18:46:45 +0200
Subject: [PATCH 46/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 3fecd1d18..845342116 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -76,8 +76,4 @@ module _3gpp-common-mnsregistry {
     uses MNSRegistryGrp;
   }
   
-  augment "/mnsregist3gpp:MNSRegistryGrp" {
-    uses MNSInfoGrp;
-   }
-  
 }
\ No newline at end of file
-- 
GitLab


From 1736381a004c9abeaad56540c07fa9692f9b38d3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 19:54:44 +0200
Subject: [PATCH 47/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 845342116..27fd8a713 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -13,6 +13,7 @@ module _3gpp-common-mnsregistry {
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
   revision 2021-08-29 { reference "Initial revision, S5-214388"; }
+  revision 2021-10-18 { reference "Update, S5-215263"; }
 
   grouping MNSInfoGrp {
     description "Represents the MNSInfo IOC.";
-- 
GitLab


From bbd553d6541f59acbb422372e64b5db4112472dc Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Mon, 18 Oct 2021 20:00:09 +0200
Subject: [PATCH 48/49] Update _3gpp-common-mnsregistry.yang

---
 yang-models/_3gpp-common-mnsregistry.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 27fd8a713..52163902b 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -12,9 +12,9 @@ module _3gpp-common-mnsregistry {
     Class (IOC) that is part of the Generic Network Resource Model (NRM).";
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
+  revision 2021-10-18 { reference "S5-215263"; }
   revision 2021-08-29 { reference "Initial revision, S5-214388"; }
-  revision 2021-10-18 { reference "Update, S5-215263"; }
-
+  
   grouping MNSInfoGrp {
     description "Represents the MNSInfo IOC.";
     reference "3GPP TS 28.622";
-- 
GitLab


From 5bf1f95fca4935fda6a5c30bfde29d0181771094 Mon Sep 17 00:00:00 2001
From: Brendan Hassett <brendan.t.hassett@huawei.com>
Date: Tue, 19 Oct 2021 11:33:35 +0200
Subject: [PATCH 49/49] S5-215266rev2 genericNrm.yaml

---
 OpenAPI/genericNrm.yaml | 46 ++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index 2b46aa48c..864d5427a 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1207,9 +1207,8 @@ components:
         AlarmList:
           $ref: '#/components/schemas/AlarmList-Single'
         MnsRegistry:
-          type: array
-          items:
-            $ref: '#/components/schemas/MnsRegistry'
+          $ref: '#/components/schemas/MnsRegistry-Single'
+          
     ManagedElement-ncO:
       type: object
       properties:
@@ -1346,22 +1345,11 @@ components:
         TraceJob:
           $ref: '#/components/schemas/TraceJob-Multiple'
 
-    MnsRegistry:
+    MnsRegistry-Single:
       type: object
       properties:
-        mnsLabel:
-          type: string
-        mnsType:
-          type: string
-          enum:
-            - ProvMnS
-            - FaultSupervisionMnS
-            - StreamingDataReportingMnS
-            - FileDataReportingMnS
-        mnsVersion:
-          type: string
-        mnsAddress:
-          type: string
+        MnsInfo:
+          $ref: '#/components/schemas/MnsInfo-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -1552,6 +1540,24 @@ components:
                   additionalProperties:
                     $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord'
 
+    MnsInfo-Single:
+      type: object
+      properties:
+        mnsLabel:
+          type: string
+        mnsType:
+          type: string
+          enum:
+            - ProvMnS
+            - FaultSupervisionMnS
+            - StreamingDataReportingMnS
+            - FileDataReportingMnS
+        mnsVersion:
+          type: string
+        mnsAddress:
+          description: Resource URI as defined in the relevant Technical Specification
+          $ref: 'comDefs.yaml#/components/schemas/Uri'
+
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
     VsDataContainer-Multiple:
@@ -1586,6 +1592,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/TraceJob-Single'
+    MnsInfo-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MnsInfo-Single'
 
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
 
@@ -1609,3 +1619,5 @@ components:
         - $ref: '#/components/schemas/TraceJob-Single'
 
         - $ref: '#/components/schemas/AlarmList-Single'
+        - $ref: '#/components/schemas/MnsRegistry-Single'
+        - $ref: '#/components/schemas/MnsInfo-Single'
-- 
GitLab