Add next-hop-group to local-routing-network-instance. (openconfig#1325)

* Move next-hop-group to local-routing-network-instance.
* use relative path for leaf-ref
* set local-routing to next major version

Author: dplore

release/models/local-routing/openconfig-local-routing-network-instance.yang

@@ -21,7 +21,14 @@ module openconfig-local-routing-network-instance {
     "This module adds leaves that relate to network-instances
      to the local routing subtree.";
 
-  oc-ext:openconfig-version "1.0.0";
+  oc-ext:openconfig-version "1.1.0";
+
+  revision "2025-07-01" {
+    description
+      "Add reference to static next-hop-group and augment the local routing
+      module.";
+    reference "1.1.0";
+  }
 
   revision "2025-06-30" {
     description
@@ -82,6 +89,59 @@ module openconfig-local-routing-network-instance {
     }
   }
 
+  grouping static-next-hop-group-networkinstance {
+    description
+      "Grouping of nodes for a reference to a static next-hop-group.";
+
+    container next-hop-group {
+      description
+        "Configuration and state parameters relating to the
+        next-hop-group. In the future, this container will replace the container
+        /network-instances/network-instance/protocols/protocol/static-routes/static/next-hops.
+        If a statically configured next-hop-group is used for a static route
+        prefix then the 'static-routes/static/next-hops' container must not
+        be used.";
+
+      container config {
+        description
+          "Configuration parameters relating to the next-hop-group.";
+
+        uses next-hop-group-config;
+      }
+
+      container state {
+        config false;
+        description
+          "Operational parameters relating to the next-hop-group.";
+
+        uses next-hop-group-config;
+      }
+    }
+  }
+
+  grouping next-hop-group-config {
+    description
+      "Grouping of configuration parameters for a reference to a
+      static next-hop-group.";
+
+    leaf name {
+      description
+        "A user defined name to reference a static next-hop-group.";
+      // we are at /network-instances/network-instance/protocols/protocol/static-routes/static/next-hop-group/config/name	
+      type leafref {
+        path "../../../../../../../oc-ni:static/oc-ni:next-hop-groups/oc-ni:next-hop-group/oc-ni:config/oc-ni:name";
+      }
+
+    }
+  }
+
+  augment "/oc-ni:network-instances/oc-ni:network-instance/oc-ni:protocols/oc-ni:protocol/oc-ni:static-routes/oc-ni:static" {
+    description
+      "Add network-instance leaves to static routing next-hop container.";
+
+    uses static-next-hop-group-networkinstance;
+  }
+
   augment "/oc-ni:network-instances/oc-ni:network-instance/oc-ni:protocols/oc-ni:protocol/oc-ni:static-routes/oc-ni:static/oc-ni:next-hops/oc-ni:next-hop/oc-ni:config" {
     description
       "Add network-instance leaves to static routing next-hop container.";

release/models/local-routing/openconfig-local-routing.yang

@@ -43,7 +43,14 @@ module openconfig-local-routing {
     protocol-specific policy after importing the route into the
     protocol for distribution (again via routing policy).";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "4.0.0";
+
+  revision "2025-07-01" {
+    description
+      "Move static next-hop-group to local-routing-network-instance and
+      augment the local routing module.";
+    reference "4.0.0";
+  }
 
   revision "2025-06-30" {
     description
@@ -324,31 +331,6 @@ module openconfig-local-routing {
           uses local-static-state;
         }
 
-        container next-hop-group {
-          description
-            "Configuration and state parameters relating to the
-            next-hop-group. In the future, this container will replace the container
-            /network-instances/network-instance/protocols/protocol/static-routes/static/next-hops.
-            If a statically configured next-hop-group is used for a static route
-            prefix then the 'static-routes/static/next-hops' container must not
-            be used.";
-
-          container config {
-            description
-              "Configuration parameters relating to the next-hop-group.";
-
-            uses next-hop-group-config;
-          }
-
-          container state {
-            config false;
-            description
-              "Operational parameters relating to the next-hop-group.";
-
-            uses next-hop-group-config;
-          }
-        }
-
         container next-hops {
           description
             "Configuration and state parameters relating
@@ -484,19 +466,4 @@ module openconfig-local-routing {
     }
   }
 
-  grouping next-hop-group-config {
-    description
-      "Grouping of configuration parameters for a static route's reference
-      to a next-hop-group.";
-
-    leaf name {
-      type leafref {
-        path "/network-instances/network-instance/static/next-hop-groups/next-hop-group/name";
-      }
-
-      description
-        "A user defined name for a next-hop-group.";
-    }
-  }
-
 }