From 389a6e85ea5c474fafb360d1a663bccd4cb7a929 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 16:25:52 +0200
Subject: [PATCH 01/20] Add new file

---
 yang-models/_3gpp-common-mnsregistry.yang | 75 +++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 yang-models/_3gpp-common-mnsregistry.yang

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
new file mode 100644
index 000000000..423f1d960
--- /dev/null
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -0,0 +1,75 @@
+module _3gpp-common-nrm-mnsregistry {
+  yang-version 1.1;
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mnsregistry";
+  prefix "nrmnsregistry3gpp";
+
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Defines the YANG mapping of the MNSRegistry Information Object
+    Class (IOC) that is part of the NR Network Resource Model (NRM).";
+  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+
+  revision 2021-08-10 { reference "Initial revision"; }
+
+  feature MNSRegistry {
+    description "Class representing MsS Discovery Service Resgistry. 
+      feature";
+  }
+
+  grouping MNSDataGrp {
+    description " This datatype represents an available Management Service (MnS
+    and provides the data required to support its discovery.";
+    reference "3GPP TS 28.541";
+    key id;
+    leaf mnsLabel {
+      description "Human-readable name of management service.";
+      mandatory true;
+      type string;
+    }
+    leaf mnsType {
+      description "Type of management service.
+      allowedValues: PROVISIONING, FAULT_SUPERVISION, PERFORMANCE_ASSURANCE.";
+      mandatory true;
+      type enumeration {
+         enum provisioning;
+         enum faultSupervision; 
+         enum performanceAssurance;
+      }
+    }
+    leaf mnsVersion {
+      description " Version of management service.";
+      mandatory true;
+      type string;
+    }    }
+    leaf componentTypeAAddress {
+      description " Addressing information for Management Service operations.";
+      mandatory true;
+      type string;
+    }    }
+    leaf componentTypeBAddress {
+      description " Addressing information for Management Service information models.";
+      mandatory true;
+      type string;
+    }
+}
+  grouping MNSRegistryGrp {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.541";
+    uses top3gpp:Top_Grp;
+  
+    list mnsList {
+      description "List of MnS Data.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MNSDataGrp;
+      }
+    }
+  }
+}
\ No newline at end of file
-- 
GitLab


From 1382c7f9c437fdb04cec66eb49f1e9d9afb53829 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 16:43:43 +0200
Subject: [PATCH 02/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 423f1d960..699c95485 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -56,8 +56,7 @@ module _3gpp-common-nrm-mnsregistry {
       mandatory true;
       type string;
     }
-}
-  grouping MNSRegistryGrp {
+    grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.541";
     uses top3gpp:Top_Grp;
-- 
GitLab


From 03f12b2fea1599ea7e8f8b80809e67289bfff90c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 17:38:45 +0200
Subject: [PATCH 03/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 699c95485..6dcda277e 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -7,7 +7,6 @@ module _3gpp-common-nrm-mnsregistry {
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
-
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the MNSRegistry Information Object
@@ -17,10 +16,24 @@ module _3gpp-common-nrm-mnsregistry {
   revision 2021-08-10 { reference "Initial revision"; }
 
   feature MNSRegistry {
-    description "Class representing MsS Discovery Service Resgistry. 
-      feature";
+    description "Class representing MsS Discovery Service Resgistry.";
   }
 
+  grouping MNSRegistryGrp {
+    description "Represents the MNSRegistry IOC.";
+    reference "3GPP TS 28.541";
+    uses top3gpp:Top_Grp;
+  
+    list mnsList {
+      description "List of MnS Data.";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MNSDataGrp;
+      }
+    }
+  }
   grouping MNSDataGrp {
     description " This datatype represents an available Management Service (MnS
     and provides the data required to support its discovery.";
@@ -45,30 +58,15 @@ module _3gpp-common-nrm-mnsregistry {
       description " Version of management service.";
       mandatory true;
       type string;
-    }    }
+    }    
     leaf componentTypeAAddress {
       description " Addressing information for Management Service operations.";
       mandatory true;
       type string;
-    }    }
+    }    
     leaf componentTypeBAddress {
       description " Addressing information for Management Service information models.";
       mandatory true;
       type string;
     }
-    grouping MNSRegistryGrp {
-    description "Represents the MNSRegistry IOC.";
-    reference "3GPP TS 28.541";
-    uses top3gpp:Top_Grp;
-  
-    list mnsList {
-      description "List of MnS Data.";
-      reference "3GPP TS 28.541";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses MNSDataGrp;
-      }
-    }
-  }
 }
\ No newline at end of file
-- 
GitLab


From d7f41861d55537300dca22c12968cf7691d90732 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 17:48:55 +0200
Subject: [PATCH 04/20] 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 6dcda277e..54ca7e596 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -33,7 +33,7 @@ module _3gpp-common-nrm-mnsregistry {
         uses MNSDataGrp;
       }
     }
-  }
+    
   grouping MNSDataGrp {
     description " This datatype represents an available Management Service (MnS
     and provides the data required to support its discovery.";
@@ -49,24 +49,25 @@ module _3gpp-common-nrm-mnsregistry {
       allowedValues: PROVISIONING, FAULT_SUPERVISION, PERFORMANCE_ASSURANCE.";
       mandatory true;
       type enumeration {
-         enum provisioning;
-         enum faultSupervision; 
-         enum performanceAssurance;
+         enum PROVISIONING;
+         enum FAULT_SUPERVISION; 
+         enum PERFORMANCE_ASSURANCE;
       }
     }
     leaf mnsVersion {
-      description " Version of management service.";
+      description "Version of management service.";
       mandatory true;
       type string;
     }    
     leaf componentTypeAAddress {
-      description " Addressing information for Management Service operations.";
+      description "Addressing information for Management Service operations.";
       mandatory true;
       type string;
     }    
     leaf componentTypeBAddress {
-      description " Addressing information for Management Service information models.";
+      description "Addressing information for Management Service information models.";
       mandatory true;
       type string;
     }
-}
\ No newline at end of file
+   }
+}
-- 
GitLab


From c16380ae3646bb6873f3f31efc35690974fca496 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 17:54:36 +0200
Subject: [PATCH 05/20] 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 54ca7e596..0227e5658 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -33,6 +33,7 @@ module _3gpp-common-nrm-mnsregistry {
         uses MNSDataGrp;
       }
     }
+  }
     
   grouping MNSDataGrp {
     description " This datatype represents an available Management Service (MnS
-- 
GitLab


From bfdfdc212b58e487f248474dc61af7084d447f2c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 17:57:50 +0200
Subject: [PATCH 06/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 0227e5658..50fd1b4d9 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -1,4 +1,4 @@
-module _3gpp-common-nrm-mnsregistry {
+module _3gpp-common-mnsregistry {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mnsregistry";
   prefix "nrmnsregistry3gpp";
@@ -39,7 +39,6 @@ module _3gpp-common-nrm-mnsregistry {
     description " This datatype represents an available Management Service (MnS
     and provides the data required to support its discovery.";
     reference "3GPP TS 28.541";
-    key id;
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
-- 
GitLab


From fa17d16b726732cd29928730ff16c9218faf19b3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 18:01:46 +0200
Subject: [PATCH 07/20] 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 50fd1b4d9..e651dbf67 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -1,7 +1,7 @@
 module _3gpp-common-mnsregistry {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mnsregistry";
-  prefix "nrmnsregistry3gpp";
+  namespace "urn:3gpp:sa5:_3gpp-common-mnsregistry";
+  prefix "mnsregistry3gpp";
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
@@ -70,4 +70,4 @@ module _3gpp-common-mnsregistry {
       type string;
     }
    }
-}
+ }
-- 
GitLab


From 362ad6f43f308c5e988ea18b81b1aeaa6e85d14e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 18:03:03 +0200
Subject: [PATCH 08/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index e651dbf67..4a5e5be47 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -65,7 +65,8 @@ module _3gpp-common-mnsregistry {
       type string;
     }    
     leaf componentTypeBAddress {
-      description "Addressing information for Management Service information models.";
+      description "Addressing information for Management Service information
+       models.";
       mandatory true;
       type string;
     }
-- 
GitLab


From 585de9c10fb2ec0a81d55d32562828ae16613283 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 18:07:39 +0200
Subject: [PATCH 09/20] 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 4a5e5be47..aecc9c439 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -71,4 +71,7 @@ module _3gpp-common-mnsregistry {
       type string;
     }
    }
+   augment "/subnet3gpp:SubNetwork" {
+    uses MNSRegistryGrp;
+   }
  }
-- 
GitLab


From 2b5206807703344bcfd891dc09f01cbffbeddbb3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 18:16:19 +0200
Subject: [PATCH 10/20] 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 aecc9c439..2f08b806e 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -3,7 +3,6 @@ module _3gpp-common-mnsregistry {
   namespace "urn:3gpp:sa5:_3gpp-common-mnsregistry";
   prefix "mnsregistry3gpp";
 
-  import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
-- 
GitLab


From 86e191861a7523ebe86c415706452ce9b07fe8a6 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 13 Aug 2021 18:17:44 +0200
Subject: [PATCH 11/20] 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 2f08b806e..0205bb66d 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -1,7 +1,7 @@
 module _3gpp-common-mnsregistry {
   yang-version 1.1;
   namespace "urn:3gpp:sa5:_3gpp-common-mnsregistry";
-  prefix "mnsregistry3gpp";
+  prefix "mnsregist3gpp";
 
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-- 
GitLab


From a2becfe7e3f41ad3f700389c568fae5bf30d1fbc Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 18 Aug 2021 14:48:29 +0200
Subject: [PATCH 12/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 0205bb66d..a11d57f85 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -9,35 +9,28 @@ module _3gpp-common-mnsregistry {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the MNSRegistry Information Object
-    Class (IOC) that is part of the NR Network Resource Model (NRM).";
-  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
+    Class (IOC) that is part of the Generic Network Resource Model (NRM).";
+  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
   revision 2021-08-10 { reference "Initial revision"; }
 
-  feature MNSRegistry {
-    description "Class representing MsS Discovery Service Resgistry.";
-  }
-
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.541";
     uses top3gpp:Top_Grp;
   
     list mnsList {
+      key "mnsType";
+      key "mnsVersion";
       description "List of MnS Data.";
-      reference "3GPP TS 28.541";
-      key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses MNSDataGrp;
-      }
+      uses MNSDataGrp;
     }
   }
     
   grouping MNSDataGrp {
     description " This datatype represents an available Management Service (MnS
     and provides the data required to support its discovery.";
-    reference "3GPP TS 28.541";
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
@@ -46,7 +39,6 @@ module _3gpp-common-mnsregistry {
     leaf mnsType {
       description "Type of management service.
       allowedValues: PROVISIONING, FAULT_SUPERVISION, PERFORMANCE_ASSURANCE.";
-      mandatory true;
       type enumeration {
          enum PROVISIONING;
          enum FAULT_SUPERVISION; 
@@ -55,7 +47,7 @@ module _3gpp-common-mnsregistry {
     }
     leaf mnsVersion {
       description "Version of management service.";
-      mandatory true;
+      ;
       type string;
     }    
     leaf componentTypeAAddress {
-- 
GitLab


From e366842ee56a077c070b5681c8c414251fd6c4ed Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 18 Aug 2021 14:55:32 +0200
Subject: [PATCH 13/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index a11d57f85..709b4c261 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -12,7 +12,7 @@ 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-08-10 { reference "Initial revision"; }
+  revision 2021-08-10 { reference "Initial revision, S5-214388"; }
 
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
@@ -20,25 +20,22 @@ module _3gpp-common-mnsregistry {
     uses top3gpp:Top_Grp;
   
     list mnsList {
-      key "mnsType";
-      key "mnsVersion";
+      key "mnsType mnsVersion";
       description "List of MnS Data.";
-      uses top3gpp:Top_Grp;
       uses MNSDataGrp;
     }
   }
     
   grouping MNSDataGrp {
     description " This datatype represents an available Management Service (MnS
-    and provides the data required to support its discovery.";
+      and provides the data required to support its discovery.";
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
       type string;
     }
     leaf mnsType {
-      description "Type of management service.
-      allowedValues: PROVISIONING, FAULT_SUPERVISION, PERFORMANCE_ASSURANCE.";
+      description "Type of management service.";
       type enumeration {
          enum PROVISIONING;
          enum FAULT_SUPERVISION; 
@@ -47,7 +44,6 @@ module _3gpp-common-mnsregistry {
     }
     leaf mnsVersion {
       description "Version of management service.";
-      ;
       type string;
     }    
     leaf componentTypeAAddress {
@@ -63,6 +59,13 @@ module _3gpp-common-mnsregistry {
     }
    }
    augment "/subnet3gpp:SubNetwork" {
-    uses MNSRegistryGrp;
-   }
+    list MNSRegistry {
+      key id;   
+      uses top3gpp:Top_Grp;      
+      container attributes {
+        uses MNSRegistryGrp ;
+      }  
+    }
+  }
+   
  }
-- 
GitLab


From 877106ee0d7885110a053df5e009a4a06656e06e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 18 Aug 2021 15:01:19 +0200
Subject: [PATCH 14/20] 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 709b4c261..e6ab68851 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -60,6 +60,7 @@ module _3gpp-common-mnsregistry {
    }
    augment "/subnet3gpp:SubNetwork" {
     list MNSRegistry {
+      description "Represents the MNSRegistry IOC.";
       key id;   
       uses top3gpp:Top_Grp;      
       container attributes {
-- 
GitLab


From 4346ee1abf102a77c9b8ce5bb94ef93abffdb912 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 18 Aug 2021 15:02:18 +0200
Subject: [PATCH 15/20] 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 e6ab68851..601a7f587 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -65,8 +65,7 @@ module _3gpp-common-mnsregistry {
       uses top3gpp:Top_Grp;      
       container attributes {
         uses MNSRegistryGrp ;
-      }  
+      }
     }
-  }
-   
  }
+}
-- 
GitLab


From d63af776bd77e2a8950f5c601ec0cf6cc96180a9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Sun, 29 Aug 2021 16:59:11 +0200
Subject: [PATCH 16/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 601a7f587..9e1e24360 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -18,22 +18,13 @@ module _3gpp-common-mnsregistry {
     description "Represents the MNSRegistry IOC.";
     reference "3GPP TS 28.541";
     uses top3gpp:Top_Grp;
-  
-    list mnsList {
-      key "mnsType mnsVersion";
-      description "List of MnS Data.";
-      uses MNSDataGrp;
-    }
-  }
     
-  grouping MNSDataGrp {
-    description " This datatype represents an available Management Service (MnS
-      and provides the data required to support its discovery.";
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
       type string;
     }
+    
     leaf mnsType {
       description "Type of management service.";
       type enumeration {
@@ -42,23 +33,20 @@ module _3gpp-common-mnsregistry {
          enum PERFORMANCE_ASSURANCE;
       }
     }
+    
     leaf mnsVersion {
       description "Version of management service.";
       type string;
     }    
-    leaf componentTypeAAddress {
+    
+    leaf mnsAddress {
       description "Addressing information for Management Service operations.";
       mandatory true;
       type string;
     }    
-    leaf componentTypeBAddress {
-      description "Addressing information for Management Service information
-       models.";
-      mandatory true;
-      type string;
     }
-   }
-   augment "/subnet3gpp:SubNetwork" {
+    
+    augment "/subnet3gpp:SubNetwork" {
     list MNSRegistry {
       description "Represents the MNSRegistry IOC.";
       key id;   
@@ -68,4 +56,4 @@ module _3gpp-common-mnsregistry {
       }
     }
  }
-}
+}
\ No newline at end of file
-- 
GitLab


From f2cb1b4accd87d42202664704232b7d327891ca4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Sun, 29 Aug 2021 17:07:26 +0200
Subject: [PATCH 17/20] 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 9e1e24360..2783fd385 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -12,7 +12,7 @@ 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-08-10 { reference "Initial revision, S5-214388"; }
+  revision 2021-08-29 { reference "Initial revision, S5-214388"; }
 
   grouping MNSRegistryGrp {
     description "Represents the MNSRegistry IOC.";
@@ -52,7 +52,7 @@ module _3gpp-common-mnsregistry {
       key id;   
       uses top3gpp:Top_Grp;      
       container attributes {
-        uses MNSRegistryGrp ;
+        uses MNSRegistryGrp;
       }
     }
  }
-- 
GitLab


From 20471d5df2e6371f7a2f2ba91bb1b7ad948b9236 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 31 Aug 2021 18:44:12 +0200
Subject: [PATCH 18/20] 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 2783fd385..7fa8d6dfb 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -44,8 +44,16 @@ module _3gpp-common-mnsregistry {
       mandatory true;
       type string;
     }    
+    
+    leaf mnsScope {
+      description "This indicates the URI of the supported NRM fragment.";
+      mandatory true;
+      type string;
+    }    
+    
     }
     
+    
     augment "/subnet3gpp:SubNetwork" {
     list MNSRegistry {
       description "Represents the MNSRegistry IOC.";
-- 
GitLab


From d4de2f706e1944adaf20b9226d15f07a96f63997 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 31 Aug 2021 18:46:36 +0200
Subject: [PATCH 19/20] 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 7fa8d6dfb..cce1554f3 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -50,10 +50,8 @@ module _3gpp-common-mnsregistry {
       mandatory true;
       type string;
     }    
-    
     }
     
-    
     augment "/subnet3gpp:SubNetwork" {
     list MNSRegistry {
       description "Represents the MNSRegistry IOC.";
-- 
GitLab


From a0134a56c60e1ff23da446070487e67334db85bb Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Tue, 31 Aug 2021 19:15:38 +0200
Subject: [PATCH 20/20] Update _3gpp-common-mnsregistry.yang

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index cce1554f3..2783fd385 100644
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -44,12 +44,6 @@ module _3gpp-common-mnsregistry {
       mandatory true;
       type string;
     }    
-    
-    leaf mnsScope {
-      description "This indicates the URI of the supported NRM fragment.";
-      mandatory true;
-      type string;
-    }    
     }
     
     augment "/subnet3gpp:SubNetwork" {
-- 
GitLab