From 772a18e9ae5b22002912028a050bea771d1d6bcc Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Sat, 9 Jul 2022 01:39:25 +0200
Subject: [PATCH 1/9] adding missing  NL, removing unneccesary NL, correcting
 _3gpp-common-mnsregistry

---
 yang-models/_3gpp-common-filemanagement.yang  |   2 +-
 .../_3gpp-common-managed-function.yang        | 199 +++++++++---------
 yang-models/_3gpp-common-mnsregistry.yang     |  57 +++--
 yang-models/_3gpp-common-trace.yang           |   2 +-
 yang-models/_3gpp-common-yang-types.yang      |   5 +-
 5 files changed, 142 insertions(+), 123 deletions(-)

diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang
index 39dc1093f..3d0df33c8 100644
--- a/yang-models/_3gpp-common-filemanagement.yang
+++ b/yang-models/_3gpp-common-filemanagement.yang
@@ -92,4 +92,4 @@ module _3gpp-common-filemanagement {
   augment "/me3gpp:ManagedElement" {
     uses FileDownloadJobSubtree;
   }
-}
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index 57d745917..c950e7563 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -7,26 +7,26 @@ module _3gpp-common-managed-function {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-measurements { prefix meas3gpp; }
   import _3gpp-common-trace { prefix trace3gpp; }
-  
+
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "The module defines a base class/grouping for major 3GPP 
+  description "The module defines a base class/grouping for major 3GPP
     functions.";
-  reference 
-    "3GPP TS 28.622 
+  reference
+    "3GPP TS 28.622
     Generic Network Resource Model (NRM)
     Integration Reference Point (IRP);
     Information Service (IS)
-    
-    3GPP TS 28.620 
+
+    3GPP TS 28.620
     Umbrella Information Model (UIM)";
   revision 2022-01-07 { reference "CR-0146"; }
-  revision 2021-01-25 { reference "CR-0122"; }  
-  revision 2020-09-30 { reference "CR-bbbb"; }  
-  revision 2020-08-06 { reference "CR-0102"; }  
-  revision 2020-08-03 { reference "CR-0095"; }  
+  revision 2021-01-25 { reference "CR-0122"; }
+  revision 2020-09-30 { reference "CR-bbbb"; }
+  revision 2020-08-06 { reference "CR-0102"; }
+  revision 2020-08-03 { reference "CR-0095"; }
   revision 2020-06-23 { reference "CR-085"; }
-  revision 2020-06-08 { reference "CR-0092"; }  
+  revision 2020-06-08 { reference "CR-0092"; }
   revision 2019-11-21 { reference "S5-197275, S5-197735"; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-18 { reference  "Initial revision"; }
@@ -38,18 +38,18 @@ module _3gpp-common-managed-function {
   feature TraceUnderManagedFunction {
     description "The TraceSubtree shall be contained under ManagedFunction";
   }
-  
+
   grouping Operation {
     description "This data type represents an Operation.";
     reference "3gpp TS 28.622";
-    
+
     leaf name {
       type string;
       mandatory true;
     }
-    
+
     leaf-list allowedNFTypes {
-      type string; 
+      type string;
       min-elements 1;
       description "The type of the managed NF service instance
         The specifc values allowed are described in TS 23.501";
@@ -67,37 +67,37 @@ module _3gpp-common-managed-function {
       reference "3GPP TS 23.502";
     }
   }
-  
-  grouping ManagedNFServiceGrp {  
+
+  grouping ManagedNFServiceGrp {
     description "A ManagedNFService represents a Network Function (NF) service.";
     reference "Clause 7 of 3GPP TS 23.501.";
 
     leaf userLabel {
         type string;
         description "A user-friendly (and user assignable) name of this object.";
-    }      
- 
+    }
+
     leaf nFServiceType {
       config false;
       mandatory true;
-      type string; 
+      type string;
       description "The type of the managed NF service instance
         The specifc values allowed are described in clause 7.2 of TS 23.501";
     }
- 
+
     list sAP {
-      key "host port";  
+      key "host port";
       min-elements 1;
       max-elements 1;
       description "The service access point of the managed NF service instance";
-      uses types3gpp:SAP;            
+      uses types3gpp:SAP;
     }
- 
+
     list operations {
       key name;
       min-elements 1;
       uses Operation ;
-      description "Set of operations supported by the managed NF 
+      description "Set of operations supported by the managed NF
         service instance";
     }
 
@@ -113,16 +113,16 @@ module _3gpp-common-managed-function {
       mandatory true;
       description "Describes whether the resource is installed and working";
     }
- 
+
     leaf usageState {
       type types3gpp:usageState ;
       config false;
       mandatory true;
-      description "Describes whether the resource is actively in use at a 
-        specific instant, and if so, whether or not it has spare 
+      description "Describes whether the resource is actively in use at a
+        specific instant, and if so, whether or not it has spare
         capacity for additional users.";
     }
- 
+
     leaf registrationState {
       type enumeration {
         enum REGISTERED;
@@ -131,123 +131,123 @@ module _3gpp-common-managed-function {
       config false;
 }
   }
-  
-  grouping Function_Grp {    
+
+  grouping Function_Grp {
     description "A base grouping for 3GPP functions.";
 
     leaf userLabel {
         type string;
         description "A user-friendly (and user assignable) name of this object.";
-    }      
+    }
   }
-  
+
   grouping ManagedFunctionGrp {
-    description "Abstract root class to be inherited/reused by classes 
+    description "Abstract root class to be inherited/reused by classes
       representing 3GPP functions.
-          
+
       Anywhere this grouping is used by classes inheriting from ManagedFunction
-      the list representing the inheriting class needs to include all 
-      contained classes of ManagedFunction too. Contained classes are 
-      either 
-      - augmented into the Function class or 
-      - shall be included in the list representing the inheriting class 
+      the list representing the inheriting class needs to include all
+      contained classes of ManagedFunction too. Contained classes are
+      either
+      - augmented into the Function class or
+      - shall be included in the list representing the inheriting class
       using the grouping  ManagedFunctionContainedClasses:
         1) EP_RP solved using augment
-        2) uses mf3gpp:ManagedFunctionContainedClasses; 
+        2) uses mf3gpp:ManagedFunctionContainedClasses;
       ";
 
     uses Function_Grp;
-    
+
     list vnfParametersList {
       key vnfInstanceId;
-      description "Contains the parameter set of the VNF 
+      description "Contains the parameter set of the VNF
         instance(s) corresponding to an NE.
         The presence of this list indicates that the ManagedFunction
-        represented is realized by one or more VNF instance(s). Otherwise it  
-        shall be absent. 
-        The presence of a vnfParametersList entry, whose vnfInstanceId with a 
-        string length of zero, in createMO operation can trigger the 
-        instantiation of the related VNF/VNFC instances.";        
-        
+        represented is realized by one or more VNF instance(s). Otherwise it
+        shall be absent.
+        The presence of a vnfParametersList entry, whose vnfInstanceId with a
+        string length of zero, in createMO operation can trigger the
+        instantiation of the related VNF/VNFC instances.";
+
       leaf vnfInstanceId {
         type string ;
         description "VNF instance identifier";
-        reference "ETSI GS NFV-IFA 008 v2.1.1: 
-          Network Functions Virtualisation (NFV); Management and Orchestration; 
+        reference "ETSI GS NFV-IFA 008 v2.1.1:
+          Network Functions Virtualisation (NFV); Management and Orchestration;
           Ve-Vnfm reference point - Interface and Information Model Specification
-          section 9.4.2 
-          
-          ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); 
+          section 9.4.2
+
+          ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV);
           Management and Orchestration; Report on NFV Information Model
           section B2.4.2.1.2.3";
       }
-      
+
       leaf vnfdId {
         type string ;
         description "Identifier of the VNFD on which the VNF instance is based.
-          The absence of the leaf or a string length of zero for vnfInstanceId 
-          means the VNF instance(s) does not exist (e.g. has not been 
+          The absence of the leaf or a string length of zero for vnfInstanceId
+          means the VNF instance(s) does not exist (e.g. has not been
           instantiated yet, has already been terminated).";
-        reference "ETSI GS NFV-IFA 008 v2.1.1: 
-          Network Functions Virtualisation (NFV); Management and Orchestration; 
+        reference "ETSI GS NFV-IFA 008 v2.1.1:
+          Network Functions Virtualisation (NFV); Management and Orchestration;
           Ve-Vnfm reference point - Interface and Information Model Specification
-          section 9.4.2"; 
+          section 9.4.2";
       }
-      
+
       leaf flavourId {
         type string ;
-        description "Identifier of the VNF Deployment Flavour applied to this 
+        description "Identifier of the VNF Deployment Flavour applied to this
           VNF instance.";
-        reference "ETSI GS NFV-IFA 008 v2.1.1: 
+        reference "ETSI GS NFV-IFA 008 v2.1.1:
           Network Functions Virtualisation (NFV) Management and Orchestration";
       }
 
       leaf autoScalable {
         type boolean ;
         mandatory true;
-        description "Indicator of whether the auto-scaling of this 
+        description "Indicator of whether the auto-scaling of this
           VNF instance is enabled or disabled.";
-      } 
+      }
     }
-    
+
     list peeParametersList {
       key idx;
-      description "Contains the parameter set for the control 
-        and monitoring of power, energy and environmental parameters of 
+      description "Contains the parameter set for the control
+        and monitoring of power, energy and environmental parameters of
         ManagedFunction instance(s).";
 
-      leaf idx { type uint32; }  
+      leaf idx { type uint32; }
 
       leaf siteIdentification {
         type string;
         mandatory true;
-        description "The identification of the site where the 
+        description "The identification of the site where the
           ManagedFunction resides.";
       }
-      
+
       leaf siteLatitude {
         type decimal64 {
           fraction-digits 4;
-          range "-90.0000..+90.0000";        
+          range "-90.0000..+90.0000";
         }
-        description "The latitude of the site where the ManagedFunction 
-          instance resides, based on World Geodetic System (1984 version) 
-          global reference frame (WGS 84). Positive values correspond to 
-          the northern hemisphere. This attribute is optional 
-          for BTSFunction, RNCFunction, GNBDUFunction and 
+        description "The latitude of the site where the ManagedFunction
+          instance resides, based on World Geodetic System (1984 version)
+          global reference frame (WGS 84). Positive values correspond to
+          the northern hemisphere. This attribute is optional
+          for BTSFunction, RNCFunction, GNBDUFunction and
           NRSectorCarrier instance(s).";
       }
-      
+
       leaf siteLongitude {
         type decimal64 {
           fraction-digits 4;
-          range "-180.0000..+180.0000";        
+          range "-180.0000..+180.0000";
         }
-        description "The longitude of the site where the ManagedFunction 
-          instance resides, based on World Geodetic System (1984 version) 
-          global reference frame (WGS 84). Positive values correspond to 
-          degrees east of 0 degrees longitude. This attribute is optional 
-          for BTSFunction, RNCFunction, GNBDUFunction and 
+        description "The longitude of the site where the ManagedFunction
+          instance resides, based on World Geodetic System (1984 version)
+          global reference frame (WGS 84). Positive values correspond to
+          degrees east of 0 degrees longitude. This attribute is optional
+          for BTSFunction, RNCFunction, GNBDUFunction and
          NRSectorCarrier
           instance(s).";
       }
@@ -257,43 +257,42 @@ module _3gpp-common-managed-function {
           fraction-digits 4;
         }
         description "The altitude of the site where the ManagedFunction
-          instance resides, in the unit of meter. This attribute is 
-          optional for BTSFunction, RNCFunction, GNBDUFunction and 
+          instance resides, in the unit of meter. This attribute is
+          optional for BTSFunction, RNCFunction, GNBDUFunction and
           NRSectorCarrier instance(s).";
       }
 
-      
       leaf siteDescription {
         type string;
         mandatory true;
-        description "An operator defined description of the site where 
+        description "An operator defined description of the site where
           the ManagedFunction instance resides.";
       }
-      
+
       leaf equipmentType {
         type string;
         mandatory true;
-        description "The type of equipment where the managedFunction 
+        description "The type of equipment where the managedFunction
           instance resides.";
         reference "clause 4.4.1 of ETSI ES 202 336-12";
       }
-      
+
       leaf environmentType {
         type string;
         mandatory true;
-        description "The type of environment where the managedFunction 
+        description "The type of environment where the managedFunction
           instance resides.";
         reference "clause 4.4.1 of ETSI ES 202 336-12";
       }
-      
+
       leaf powerInterface {
         type string;
         mandatory true;
         description "The type of power.";
         reference "clause 4.4.1 of ETSI ES 202 336-12";
-      } 
+      }
     }
-    
+
     leaf priorityLabel {
       mandatory true;
       type uint32;
@@ -302,7 +301,7 @@ module _3gpp-common-managed-function {
   }
 
   grouping ManagedFunctionContainedClasses {
-    description "A grouping used to containe classes (lists) contained by 
+    description "A grouping used to containe classes (lists) contained by
       the abstract IOC ManagedFunction";
     list ManagedNFService {
       description "Represents a Network Function (NF)";
@@ -313,13 +312,13 @@ module _3gpp-common-managed-function {
         uses ManagedNFServiceGrp;
       }
     }
-    
+
     uses meas3gpp:MeasurementSubtree {
       if-feature MeasurementsUnderManagedFunction ;
-    }    
-    
+    }
+
     uses trace3gpp:TraceSubtree {
       if-feature TraceUnderManagedFunction ;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index df01996aa..37228c513 100755
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -16,16 +16,15 @@ module _3gpp-common-mnsregistry {
   revision 2021-11-23 { reference "S5-216090"; }
   revision 2021-10-18 { reference "S5-215263"; }
   revision 2021-08-29 { reference "Initial revision, S5-214388"; }
-  
-  grouping MNSInfoGrp {
-    description "Represents the MNSInfo IOC.";
-    reference "3GPP TS 28.622";
+
+  grouping MnsInfoGrp {
+    description "Represents the MnsInfo IOC.";
     leaf mnsLabel {
       description "Human-readable name of management service.";
       mandatory true;
       type string;
     }
-    
+
     leaf mnsType {
       description "Type of management service.";
       type enumeration {
@@ -35,40 +34,60 @@ module _3gpp-common-mnsregistry {
          enum FileDataReportingMnS;
       }
     }
-    
+
     leaf mnsVersion {
       description "Version of management service.";
       type string;
-    }    
-    
+    }
+
     leaf mnsAddress {
       description "Addressing information for Management Service operations.";
       mandatory true;
       type string;
-    }    
-    
+    }
+
     leaf-list mnsScope {
-      description "List of the managed object instances that can be accessed using the MnS. If a complete SubNetwork can be accessed using the MnS, this attribute may contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork.";
+      description "List of the managed object instances that can be accessed 
+        using the MnS. If a complete SubNetwork can be accessed using the MnS, 
+        this attribute may contain the DN of the SubNetwork instead of the 
+        DNs of the individual managed entities within the SubNetwork.";
       min-elements 1;
       type types3gpp:DistinguishedName;
     }
-    
   }
-  
+
   augment "/subnet3gpp:SubNetwork" {
     list MNSRegistry {
-      description "Represents the MNSRegistry IOC.";
-      reference "3GPP TS 28.622";
+      description "Represents the MNSRegistry IOC.
+        The IOC is instantiated by the system.";
       uses top3gpp:Top_Grp;
       key id;
       max-elements 1;
+      
       list MNSInfo {
-        description "Represents the MNSInfo IOC.";
-        reference "3GPP TS 28.622";
+        description "This IOC represents an available Management Service (MnS) 
+          and provides the data required to support its discovery.  
+          It is name-contained by MnsRegistry.
+
+          This information is used by the consumer to discover the producers 
+          of specific Management Services and to derive the addresses of the 
+          Management Service.
+
+          Attributes mnsLabel, mnsType, and mnsVersion are used to describe 
+          the Management Service.
+
+          Attribute mnsAddress is used to provide addressing information for 
+          the Management Service operations.
+
+          Attribute mnsScope is used to provide information about the 
+          management scope of the Management Service. The management scope is 
+          defined as the set of managed object instances that can be accessed 
+          using the Management Service.";
+          
         uses top3gpp:Top_Grp;
         key "mnsType mnsVersion mnsAddress";
-        uses MNSInfoGrp;
+        uses MnsInfoGrp;
       }
     }
   }
-}	
+}	
\ No newline at end of file
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 8051893e7..5fd0bc0eb 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1117,4 +1117,4 @@ module _3gpp-common-trace {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 18084a2eb..6bc0d1e75 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -15,6 +15,7 @@ module _3gpp-common-yang-types {
 
   revision 2022-02-09 { reference "CR-0144"; }
   revision 2021-11-01 { reference "CR-0141"; }
+  
   revision 2021-09-30 {
     description "Added Longitude, Latitude, TenthOfDegrees, OnOff.";
     reference "CR-0138";
@@ -68,7 +69,7 @@ module _3gpp-common-yang-types {
 
       The progress of the process is described by the 'status' and 
       'progressPercentage' attributes. Additional textual qualifications for 
-      the 'status' attribute may be provided by the 'progessStateInfo' and 
+      the 'status' attribute may be provided by the 'progressStateInfo' and 
       'resultStateInfo' attributes.
 
       When the process is instantiated, the 'status' is set to 'NOT_RUNNING' 
@@ -80,7 +81,7 @@ module _3gpp-common-yang-types {
 
       During the 'RUNNING' state the 'progressPercentage' attribute may be 
       repeatedly updated. The exact semantic of this attribute is subject to 
-      further specialisation. The 'progessInfo' attribute may be used to 
+      further specialisation. The 'progressInfo' attribute may be used to 
       provide additional textual information in the 'NOT_RUNNING', 'CANCELLING' 
       and 'RUNNING' states. Further specialisation of 
       'progressStateInfo' may be provided where this data type is 
-- 
GitLab


From 28a77b79718693ae34267e9a72de7d6d214e9d4b Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Sat, 9 Jul 2022 01:47:34 +0200
Subject: [PATCH 2/9] coreccting mnsregistry formatting

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

diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang
index 37228c513..1ca847b43 100755
--- a/yang-models/_3gpp-common-mnsregistry.yang
+++ b/yang-models/_3gpp-common-mnsregistry.yang
@@ -47,9 +47,9 @@ module _3gpp-common-mnsregistry {
     }
 
     leaf-list mnsScope {
-      description "List of the managed object instances that can be accessed 
-        using the MnS. If a complete SubNetwork can be accessed using the MnS, 
-        this attribute may contain the DN of the SubNetwork instead of the 
+      description "List of the managed object instances that can be accessed
+        using the MnS. If a complete SubNetwork can be accessed using the MnS,
+        this attribute may contain the DN of the SubNetwork instead of the
         DNs of the individual managed entities within the SubNetwork.";
       min-elements 1;
       type types3gpp:DistinguishedName;
@@ -63,31 +63,31 @@ module _3gpp-common-mnsregistry {
       uses top3gpp:Top_Grp;
       key id;
       max-elements 1;
-      
+
       list MNSInfo {
-        description "This IOC represents an available Management Service (MnS) 
-          and provides the data required to support its discovery.  
+        description "This IOC represents an available Management Service (MnS)
+          and provides the data required to support its discovery.
           It is name-contained by MnsRegistry.
 
-          This information is used by the consumer to discover the producers 
-          of specific Management Services and to derive the addresses of the 
+          This information is used by the consumer to discover the producers
+          of specific Management Services and to derive the addresses of the
           Management Service.
 
-          Attributes mnsLabel, mnsType, and mnsVersion are used to describe 
+          Attributes mnsLabel, mnsType, and mnsVersion are used to describe
           the Management Service.
 
-          Attribute mnsAddress is used to provide addressing information for 
+          Attribute mnsAddress is used to provide addressing information for
           the Management Service operations.
 
-          Attribute mnsScope is used to provide information about the 
-          management scope of the Management Service. The management scope is 
-          defined as the set of managed object instances that can be accessed 
+          Attribute mnsScope is used to provide information about the
+          management scope of the Management Service. The management scope is
+          defined as the set of managed object instances that can be accessed
           using the Management Service.";
-          
+
         uses top3gpp:Top_Grp;
         key "mnsType mnsVersion mnsAddress";
         uses MnsInfoGrp;
       }
     }
   }
-}	
\ No newline at end of file
+}
\ No newline at end of file
-- 
GitLab


From f4e5023284c27417754810478a1e343fd1083ac8 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Sat, 9 Jul 2022 02:23:22 +0200
Subject: [PATCH 3/9] aprok az otnegyvenegy ben

---
 yang-models/_3gpp-nr-nrm-dlbofunction.yang    | 5 +++--
 yang-models/_3gpp-nr-nrm-dmrofunction.yang    | 2 +-
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 +++-
 yang-models/_3gpp-nr-nrm-nrcelldu.yang        | 1 -
 yang-models/_3gpp-ns-nrm-sliceprofile.yang    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
index a9915f7f3..d532fe037 100644
--- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang
@@ -16,7 +16,7 @@ module _3gpp-nr-nrm-dlbofunction {
     Model (NRM).";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2022-03-25 { reference "CR-XXXX"; }
+  revision 2022-03-25 { reference "CR-0683"; }
   revision 2021-10-22 { reference "CR-0577"; }  
 
   feature DLBOUnderGNBCUCPFunction {
@@ -49,6 +49,7 @@ module _3gpp-nr-nrm-dlbofunction {
         type int32 { range "-20..20"; }
         units "0.5 dB";
     }
+
     leaf maximumDeviationHoTriggerHigh {
       description "This parameter defines the maximum allowed upper 
         deviation of the Handover Trigger, from the default point of 
@@ -97,4 +98,4 @@ module _3gpp-nr-nrm-dlbofunction {
     if-feature DLBOUnderSubNetwork;
     uses DLBOFunctionSubtree;
   }
-}
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
index f56ee7012..4a065cdf9 100755
--- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang
@@ -98,4 +98,4 @@ module _3gpp-nr-nrm-dmrofunction {
     if-feature subnet3gpp:DMROFunction;
     uses DMROFunctionSubtree;
   }
-}
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 4c4cee4d6..9e7db4e54 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -102,7 +102,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     leaf-list xnHOBlackList {
       type string;
       description "List of nodes to which handovers over  Xn are prohibited.";
-         }
+    }
+
     leaf configurable5QISetRef {
       type types3gpp:DistinguishedName;
       description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to).";
@@ -112,6 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       type string;
       description "List of nodes to which handovers over X2 are prohibited.";
     }
+
     leaf dynamic5QISetRef {
       type types3gpp:DistinguishedName;
       description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to).";
diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
index 0cb6dce0c..9380e0855 100755
--- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
@@ -12,7 +12,6 @@ module _3gpp-nr-nrm-nrcelldu {
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import ietf-yang-types { prefix yang; }
 
-
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRCellDU Information Object
diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
index c1441d45a..1e3217278 100755
--- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang
+++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
@@ -1049,4 +1049,4 @@ submodule _3gpp-ns-nrm-sliceprofile {
 	  uses TopSliceSubnetProfileGrp;
     }
   }
-}
+}
\ No newline at end of file
-- 
GitLab


From be9ea4b0d6189a76e519478d500b0d5f600d88db Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 26 Jul 2022 15:16:26 -0400
Subject: [PATCH 4/9] added BasicAdminState type7

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

diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 6bc0d1e75..131571863 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -13,6 +13,7 @@ module _3gpp-common-yang-types {
     network slicing.";
   reference "3GPP TS 28.623";
 
+  revision 2022-07-26 { reference CR-balazs145-r17-623-yang-corrections  }
   revision 2022-02-09 { reference "CR-0144"; }
   revision 2021-11-01 { reference "CR-0141"; }
   
@@ -429,6 +430,24 @@ module _3gpp-common-yang-types {
     }
   }
   
+  typedef BasicAdministrativeState {
+    reference "3GPP TS 28.625 and ITU-T X.731";
+    type enumeration {
+      enum LOCKED {
+        value 0;
+        description "The resource is administratively prohibited from performing
+                 services for its users.";
+      }
+
+      enum UNLOCKED {
+        value 1;
+        description "The resource is administratively permitted to perform
+          services for its users. This is independent of its inherent
+          operability.";
+      }
+    }
+  }
+  
   typedef AdministrativeState {
     reference "3GPP TS 28.625 and ITU-T X.731";
     type enumeration {
-- 
GitLab


From b7ae4de941156df3e172e678985ef622310632a3 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 26 Jul 2022 15:32:29 -0400
Subject: [PATCH 5/9] added BasicAdminState type- - error corrected

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

diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 131571863..4a87c50ce 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -13,7 +13,7 @@ module _3gpp-common-yang-types {
     network slicing.";
   reference "3GPP TS 28.623";
 
-  revision 2022-07-26 { reference CR-balazs145-r17-623-yang-corrections  }
+  revision 2022-07-26 { reference CR-balazs145-r17-623-yang-corrections ; }
   revision 2022-02-09 { reference "CR-0144"; }
   revision 2021-11-01 { reference "CR-0141"; }
   
-- 
GitLab


From 0c31038d8e6079b0f09a3149656ed8c467177a14 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 26 Jul 2022 15:46:17 -0400
Subject: [PATCH 6/9] added xx.yang to test validation scripts

---
 yang-models/xx.yang | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 yang-models/xx.yang

diff --git a/yang-models/xx.yang b/yang-models/xx.yang
new file mode 100644
index 000000000..6c047e30c
--- /dev/null
+++ b/yang-models/xx.yang
@@ -0,0 +1,16 @@
+module xx {
+  yang-version 1.1;
+  namespace "urn:3gpp:xxx";
+  prefix "xxgpp";
+  
+  import ietf-yang-types { prefix yang; }
+
+  organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "Test module to test eforge validation scripts";
+  reference "3GPP TS 28.623";
+
+  revision 2022-07-26 { reference CR-xx ; }
+
+  leaf xx { type string }
+}
\ No newline at end of file
-- 
GitLab


From 2ce8bdccf66250e711ef441c922395c429b885e3 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Tue, 26 Jul 2022 15:55:38 -0400
Subject: [PATCH 7/9] added xx.yang to test validation scripts error corrected

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

diff --git a/yang-models/xx.yang b/yang-models/xx.yang
index 6c047e30c..443dd6ae7 100644
--- a/yang-models/xx.yang
+++ b/yang-models/xx.yang
@@ -3,8 +3,6 @@ module xx {
   namespace "urn:3gpp:xxx";
   prefix "xxgpp";
   
-  import ietf-yang-types { prefix yang; }
-
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Test module to test eforge validation scripts";
@@ -12,5 +10,5 @@ module xx {
 
   revision 2022-07-26 { reference CR-xx ; }
 
-  leaf xx { type string }
+  leaf xx { type string ;}
 }
\ No newline at end of file
-- 
GitLab


From e0be0a1f2a2c9c829bbe743600e258e92916114a Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Thu, 4 Aug 2022 12:40:56 +0200
Subject: [PATCH 8/9] removed xx.yang test file

---
 yang-models/xx.yang | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 yang-models/xx.yang

diff --git a/yang-models/xx.yang b/yang-models/xx.yang
deleted file mode 100644
index 443dd6ae7..000000000
--- a/yang-models/xx.yang
+++ /dev/null
@@ -1,14 +0,0 @@
-module xx {
-  yang-version 1.1;
-  namespace "urn:3gpp:xxx";
-  prefix "xxgpp";
-  
-  organization "3GPP SA5";
-  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "Test module to test eforge validation scripts";
-  reference "3GPP TS 28.623";
-
-  revision 2022-07-26 { reference CR-xx ; }
-
-  leaf xx { type string ;}
-}
\ No newline at end of file
-- 
GitLab


From 2a1757704243391d318740249676bafc555dabb8 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Thu, 4 Aug 2022 13:01:37 +0200
Subject: [PATCH 9/9] Added CR number

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

diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 4a87c50ce..0986cdefc 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -13,7 +13,7 @@ module _3gpp-common-yang-types {
     network slicing.";
   reference "3GPP TS 28.623";
 
-  revision 2022-07-26 { reference CR-balazs145-r17-623-yang-corrections ; }
+  revision 2022-07-26 { reference CR-0180 ; }
   revision 2022-02-09 { reference "CR-0144"; }
   revision 2021-11-01 { reference "CR-0141"; }
   
-- 
GitLab