From 7e546dec00d95ba76ffb7b24d728b230ce8dc7ec Mon Sep 17 00:00:00 2001
From: Shashank-arista <153792517+Shashank-arista@users.noreply.github.com>
Date: Wed, 17 Apr 2024 22:27:44 +0530
Subject: [PATCH] Augmented attributes interface-ref and metric fields to
 mpls-static lsp (#1021)

* Add interface-ref and metric fields to mpls-static lsp
---
 release/models/mpls/openconfig-mpls-igp.yang  |  9 ++++++++-
 .../models/mpls/openconfig-mpls-static.yang   | 19 ++++++++++++++++++-
 release/models/mpls/openconfig-mpls-te.yang   |  9 ++++++++-
 .../models/mpls/openconfig-mpls-types.yang    |  9 ++++++++-
 release/models/mpls/openconfig-mpls.yang      |  9 ++++++++-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/release/models/mpls/openconfig-mpls-igp.yang b/release/models/mpls/openconfig-mpls-igp.yang
index e71c26657..6bbbf1cd8 100644
--- a/release/models/mpls/openconfig-mpls-igp.yang
+++ b/release/models/mpls/openconfig-mpls-igp.yang
@@ -21,7 +21,14 @@ submodule openconfig-mpls-igp {
     "Configuration generic configuration parameters for IGP-congruent
     LSPs";
 
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-12-14" {
+    description
+      "Added additional attributes oc-if:interface-ref
+      and metric attributes to static lsp";
+    reference "3.5.0";
+  }
 
   revision "2023-07-25" {
     description
diff --git a/release/models/mpls/openconfig-mpls-static.yang b/release/models/mpls/openconfig-mpls-static.yang
index 0a60e9628..d114fe16c 100644
--- a/release/models/mpls/openconfig-mpls-static.yang
+++ b/release/models/mpls/openconfig-mpls-static.yang
@@ -10,6 +10,7 @@ submodule openconfig-mpls-static {
   import openconfig-mpls-types {prefix oc-mplst; }
   import openconfig-inet-types { prefix inet; }
   import openconfig-extensions { prefix oc-ext; }
+  import openconfig-interfaces { prefix oc-if; }
 
 
   // meta
@@ -23,7 +24,14 @@ submodule openconfig-mpls-static {
     "Defines static LSP configuration";
 
 
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-12-14" {
+    description
+      "Added additional attributes oc-if:interface-ref
+      and metric attributes to static lsp";
+    reference "3.5.0";
+  }
 
   revision "2023-07-25" {
     description
@@ -170,6 +178,15 @@ submodule openconfig-mpls-static {
         "label value to push at the current hop for the
         LSP";
     }
+
+    // interface-ref
+    uses oc-if:interface-ref-common;
+
+    leaf metric {
+      type uint8;
+      description
+        "Specifies metric value used for the MPLS route";
+    }
   }
 
   grouping static-lsp-ingress-config {
diff --git a/release/models/mpls/openconfig-mpls-te.yang b/release/models/mpls/openconfig-mpls-te.yang
index 2fe988e1a..4b12dc66e 100644
--- a/release/models/mpls/openconfig-mpls-te.yang
+++ b/release/models/mpls/openconfig-mpls-te.yang
@@ -30,7 +30,14 @@ submodule openconfig-mpls-te {
     signaling protocol or mechanism (see related submodules for
     signaling protocol-specific configuration).";
 
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-12-14" {
+    description
+      "Added additional attributes oc-if:interface-ref
+      and metric attributes to static lsp";
+    reference "3.5.0";
+  }
 
   revision "2023-07-25" {
     description
diff --git a/release/models/mpls/openconfig-mpls-types.yang b/release/models/mpls/openconfig-mpls-types.yang
index 1df30b3b9..765e467cf 100644
--- a/release/models/mpls/openconfig-mpls-types.yang
+++ b/release/models/mpls/openconfig-mpls-types.yang
@@ -19,7 +19,14 @@ module openconfig-mpls-types {
   description
     "General types for MPLS / TE data model";
 
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-12-14" {
+    description
+      "Added additional attributes oc-if:interface-ref
+      and metric attributes to static lsp";
+    reference "3.5.0";
+  }
 
   revision "2021-12-01" {
     description
diff --git a/release/models/mpls/openconfig-mpls.yang b/release/models/mpls/openconfig-mpls.yang
index dde71fba3..f78e1a0ec 100644
--- a/release/models/mpls/openconfig-mpls.yang
+++ b/release/models/mpls/openconfig-mpls.yang
@@ -70,7 +70,14 @@ module openconfig-mpls {
                +------+      |ROUTING|      +-----+
                              +-------+
     ";
-  oc-ext:openconfig-version "3.4.0";
+  oc-ext:openconfig-version "3.5.0";
+
+  revision "2023-12-14" {
+    description
+      "Added additional attributes oc-if:interface-ref
+      and metric attributes to static lsp";
+    reference "3.5.0";
+  }
 
   revision "2023-07-25" {
     description