Merge branch 'openconfig:master' into master

openconfig · Aug 9, 2024 · 68a38ff · 68a38ff
2 parents 99c5637 + 6e28490
commit 68a38ff
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 8 deletions.
diff --git a/release/models/optical-transport/openconfig-optical-attenuator.yang b/release/models/optical-transport/openconfig-optical-attenuator.yang
@@ -24,7 +24,13 @@ module openconfig-optical-attenuator {
     for variable optical attenuators, deployed as part of a transport
     line system.";
 
-  oc-ext:openconfig-version "0.1.0";
+  oc-ext:openconfig-version "0.2.0";
+
+  revision "2024-07-10" {
+    description
+      "Adding SYSTEM_CONTROLLED mode with accompanying leaves";
+    reference "0.2.0";
+  }
 
   revision "2019-07-19" {
     description
@@ -62,6 +68,12 @@ module openconfig-optical-attenuator {
         "Constant attenuation mode";
   }
 
+  identity SYSTEM_CONTROLLED {
+      base OPTICAL_ATTENUATOR_MODE;
+      description
+        "System controls the attenuation value.";
+  }
+
 
   // grouping statements
 
@@ -112,6 +124,28 @@ module openconfig-optical-attenuator {
          maintain constant output power.  When false, the attenuator is set
          max attenuation or blocked.";
     }
+
+    leaf max-output-power {
+      type decimal64 {
+        fraction-digits 2;
+      }
+      units dBm;
+      description
+        "The max power level allowed on the output of attenuator. This leaf
+        is optional when in SYSTEM_CONTROLLED mode.";
+    }
+
+    leaf max-output-power-threshold {
+      type decimal64 {
+        fraction-digits 2;
+      }
+      units dB;
+      description
+        "If the system-derived-target-output-power is equal to or greater than
+        'max-output-power + max-output-power-threshold', a device alarm will
+        be raised within /system/alarms. This leaf is only relevant when
+        in SYSTEM_CONTROLLED mode.";
+    }
   }
 
   grouping optical-attenuator-state {
@@ -150,6 +184,15 @@ module openconfig-optical-attenuator {
         port. This leaf is only valid for ports of type EGRESS.";
     }
 
+    leaf system-derived-target-output-power {
+      type decimal64 {
+        fraction-digits 2;
+      }
+      units dBm;
+      description
+        "The target output power as determined by the device.
+        This leaf is only relevant when in SYSTEM_CONTROLLED mode.";
+    }
 
     container actual-attenuation {
       description

diff --git a/release/models/ospf/openconfig-ospfv2-area-interface.yang b/release/models/ospf/openconfig-ospfv2-area-interface.yang
@@ -25,7 +25,13 @@ submodule openconfig-ospfv2-area-interface {
     "This submodule provides OSPFv2 configuration and operational
     state parameters that are specific to the area context";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description

diff --git a/release/models/ospf/openconfig-ospfv2-area.yang b/release/models/ospf/openconfig-ospfv2-area.yang
@@ -23,7 +23,13 @@ submodule openconfig-ospfv2-area {
     "This submodule provides OSPFv2 configuration and operational
     state parameters that are specific to the area context";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description

diff --git a/release/models/ospf/openconfig-ospfv2-common.yang b/release/models/ospf/openconfig-ospfv2-common.yang
@@ -17,7 +17,13 @@ submodule openconfig-ospfv2-common {
     "This submodule provides OSPFv2 configuration and operational
     state parameters that are shared across multiple contexts";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description

diff --git a/release/models/ospf/openconfig-ospfv2-global.yang b/release/models/ospf/openconfig-ospfv2-global.yang
@@ -23,7 +23,13 @@ submodule openconfig-ospfv2-global {
     "This submodule provides OSPFv2 configuration and operational
     state parameters that are global to a particular OSPF instance";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description

diff --git a/release/models/ospf/openconfig-ospfv2-lsdb.yang b/release/models/ospf/openconfig-ospfv2-lsdb.yang
@@ -22,7 +22,13 @@ submodule openconfig-ospfv2-lsdb {
     "An OpenConfig model for the Open Shortest Path First (OSPF)
     version 2 link-state database (LSDB)";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description
@@ -749,7 +755,7 @@ submodule openconfig-ospfv2-lsdb {
       } // grace LSA
 
       container router-information {
-        when "../state/type = 'oc-ospf-types:ROUTER_INFORMATION_LSA'" {
+        when "../state/type = 'oc-ospf-types:ROUTER_INFORMATION'" {
           description
             "Include the router-information container when the opaque LSA
             type is specified to be an RI LSA";

diff --git a/release/models/ospf/openconfig-ospfv2.yang b/release/models/ospf/openconfig-ospfv2.yang
@@ -34,7 +34,13 @@ module openconfig-ospfv2 {
     "An OpenConfig model for Open Shortest Path First (OSPF)
     version 2";
 
-  oc-ext:openconfig-version "0.5.1";
+  oc-ext:openconfig-version "0.5.2";
+
+  revision "2024-06-17" {
+    description
+      "Correct ROUTER_INFORMATION_LSA to ROUTER_INFORMATION.";
+    reference "0.5.2";
+  }
 
   revision "2023-11-01" {
     description