Merge "Update YANG models for OpenFronthaul M-Plane."

[sim/o1-interface.git] / ntsimulator / deploy / o-ran-ru-fh / yang / o-ran-interfaces.yang

diff --git a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces@2020-12-10.yang b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces.yang
similarity index 94%
rename from ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces@2020-12-10.yang
rename to ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces.yang
index 78de3d1..f2678b3 100644 (file)
--- a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces@2020-12-10.yang
+++ b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-interfaces.yang
@@ -38,10 +38,10 @@ module o-ran-interfaces {
     "www.o-ran.org";
 
   description
-    "This module defines the YANG definitions for managng the O-RAN
+    "This module defines the YANG definitions for managing the O-RAN
      interfaces.
 
-    Copyright 2020 the O-RAN Alliance.
+    Copyright 2021 the O-RAN Alliance.
 
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -67,6 +67,24 @@ module o-ran-interfaces {
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.";
 
+  revision "2021-12-01" {
+    description
+      "version 5.2.0
+
+      1) typographical corrections in descriptions.";
+
+    reference "ORAN-WG4.M.0-v05.00";
+  }
+
+  revision "2021-03-22" {
+    description
+      "version 5.1.0
+
+      1) typographical corrections in descriptions.";
+
+    reference "ORAN-WG4.M.0-v05.00";
+  }
+
   revision "2020-12-10" {
     description
       "version 5.0.0
@@ -228,6 +246,11 @@ module o-ran-interfaces {
     }
   }
 
+  rpc reset-interface-counters {
+    description
+      "Management plane triggered restart of the interface counters.";
+  }
+
 // Cross Working Group Augmentations Follow
 
 // Cross Working Group augmentations for basic Ethernet leafs
@@ -301,7 +324,7 @@ module o-ran-interfaces {
           "The base interface must have VLAN tagging enabled.";
       }
       description
-        "The base interface for the VLAN sub-interafce.";
+        "The base interface for the VLAN sub-interface.";
     }
     leaf vlan-id {
       type uint16 {
@@ -312,7 +335,7 @@ module o-ran-interfaces {
     }
   }
 
-// Cross Working Group augmention for both ethernetCsmacd and l2vlan interfaces
+// Cross Working Group augmentation for both ethernetCsmacd and l2vlan interfaces
 
   augment "/if:interfaces/if:interface" {
     when "(if:type = 'ianaift:ethernetCsmacd') or
@@ -331,7 +354,7 @@ module o-ran-interfaces {
     }
   }
 
-// Cross Working Group augmention to ietf-ip covering DSCP for M-Plane
+// Cross Working Group augmentation to ietf-ip covering DSCP for M-Plane
 
 augment "/if:interfaces/if:interface/ip:ipv4" {
   description "augments for IPv4 based M-Plane transport";
@@ -355,11 +378,11 @@ augment "/if:interfaces/if:interface/ip:ipv6" {
 // WG4 Augmentation for basic Ethernet leafs
 
   augment "/if:interfaces/if:interface" {
-    if-feature ALIASMAC-BASED-CU-PLANE;
     when "if:type = 'ianaift:ethernetCsmacd'" {
       description
         "Applies to WG4 Ethernet interfaces for alias MAC based CU-Plane";
     }
+    if-feature ALIASMAC-BASED-CU-PLANE;
     description
       "Augment the interface model with parameters for
       base Ethernet interface";
@@ -373,7 +396,7 @@ augment "/if:interfaces/if:interface/ip:ipv6" {
 
   }
 
-// WG4 Augmention for both ethernetCsmacd and l2vlan interfaces
+// WG4 Augmentation for both ethernetCsmacd and l2vlan interfaces
 
   augment "/if:interfaces/if:interface" {
     when "(if:type = 'ianaift:ethernetCsmacd') or
@@ -420,7 +443,7 @@ augment "/if:interfaces/if:interface/ip:ipv6" {
     }
   }
 
-// WG4 specific augmention to ietf-ip covering DSCP for CUS Plane
+// WG4 specific augmentation to ietf-ip covering DSCP for CUS Plane
 
   augment "/if:interfaces/if:interface/ip:ipv4" {
     if-feature UDPIP-BASED-CU-PLANE;
@@ -482,9 +505,4 @@ augment "/if:interfaces/if:interface/ip:ipv6" {
   }
 // interface-grouping insert - end;
 
-
-  rpc reset-interface-counters {
-    description
-      "Management plane triggered restart of the interface counters.";
-  }
 }