Address comment: Make flex-algo-name optional. Use flex-algo-id every…

…where
openconfig · Jul 14, 2023 · 386e832 · 386e832
1 parent 73f7c24
commit 386e832
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/release/models/flex-algo/openconfig-flexalgo.yang b/release/models/flex-algo/openconfig-flexalgo.yang
@@ -84,17 +84,17 @@ module openconfig-flexalgo {
     description
       "All of the possible attributes for an flexible algorithm
        definition";
-    leaf name {
-      type string;
-      description
-        "Flexible Algorithm name";
-    }
     leaf flex-algo-id {
       type flex-algo-id;
       mandatory true;
       description
         "Flex Algorithm Identifier";
     }
+    leaf flex-algo-name {
+      type string;
+      description
+        "Flexible Algorithm name";
+    }
     leaf flex-algo-description {
       type string;
       description
@@ -161,12 +161,12 @@ module openconfig-flexalgo {
     description
       "Top level grouping for flexible Algorithms and their definitions";
     list algorithm {
-      key "name";
+      key "flex-algo-id";
       description
         "List of Flexible Algorithms";
-      leaf name {
+      leaf flex-algo-id {
         type leafref {
-          path "../config/name";
+          path "../config/flex-algo-id";
         }
         description
           "Name for a Flexible Algorithm";

diff --git a/release/models/segment-routing/openconfig-segment-routing.yang b/release/models/segment-routing/openconfig-segment-routing.yang
@@ -566,10 +566,12 @@ module openconfig-segment-routing {
   grouping flex-algo-binding-attributes {
     description
       "Attributes for Flexible Algorithm bindings";
-    leaf flex-algo-name {
-      type string;
+    leaf flex-algo-id {
+      type uint8 {
+	range "128..255";
+      }
       description
-        "Name of a Flexible Algorithm";
+        "Flexible Algorithm identifier";
     }
     leaf isis-level {
       type oc-isis-types:level-type;
@@ -619,15 +621,15 @@ module openconfig-segment-routing {
         description
           "Flex Algorithm bindings";
         list flex-algorithm-binding {
-          key "flex-algo-name";
+          key "flex-algo-id";
           description
-            "Flex Algorithm binding for a given algorithm name";
-          leaf flex-algo-name {
+            "Flex Algorithm binding";
+          leaf flex-algo-id {
             type leafref {
-              path "../config/flex-algo-name";
+              path "../config/flex-algo-id";
             }
             description
-              "Flex Algorithm name used by IGP";
+              "Flex Algorithm identifier used by IGP";
           }
           container config {
             description
@@ -761,10 +763,12 @@ module openconfig-segment-routing {
          value specified is a local prefix on the interface which is advertised
          into the IGP.";
     }
-    leaf flex-algo-name {
-      type string;
+    leaf flex-algo-id {
+      type uint8 {
+	range "128..255";
+      }
       description
-        "Name of the Flexible Algorithm for the prefix segment.";
+        "Flexible Algorithm identifier for the prefix segment.";
     }
     leaf sid-id {
       type oc-srt:sr-sid-type;
@@ -829,7 +833,7 @@ module openconfig-segment-routing {
            routing flexible algorithm for an interface within the IGP.";
 
         list flex-algo-prefix-sid {
-          key "prefix flex-algo-name";
+          key "prefix flex-algo-id";
 
           description
             "IGP prefix segments allocated for Flexible Algorithms";
@@ -843,9 +847,9 @@ module openconfig-segment-routing {
               advertised.";
           }
 
-          leaf flex-algo-name {
+          leaf flex-algo-id {
             type leafref {
-              path "../config/flex-algo-name";
+              path "../config/flex-algo-id";
             }
             description
               "Reference to the Flexible Algorithm for which Flexible Algorithm Prefix