Add BGP group/neighbor level and policy support for AIGP

release/models/bgp/openconfig-bgp-policy.yang

@@ -28,7 +28,13 @@ module openconfig-bgp-policy {
     It augments the base routing-policy module with BGP-specific
     options for conditions and actions.";
 
-  oc-ext:openconfig-version "8.2.0";
+  oc-ext:openconfig-version "8.3.0";
+
+  revision "2026-03-17" {
+    description
+      "Add set-aigp to BGP policy actions.";
+    reference "8.3.0";
+  }
 
   revision "2025-05-23" {
     description
@@ -1405,6 +1411,12 @@ module openconfig-bgp-policy {
         valid options.  When set to 'IGP', this action must be set to
         'SET'.";
     }
+
+    leaf set-aigp {
+      type uint64;
+      description
+        "Set the AIGP metric attribute in the route update.";
+    }
   }
 
   grouping bgp-actions-state {

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

@@ -50,7 +50,13 @@ module openconfig-network-instance {
     virtual switch instance (VSI). Mixed Layer 2 and Layer 3
     instances are also supported.";
 
-  oc-ext:openconfig-version "4.6.0";
+  oc-ext:openconfig-version "4.7.0";
+
+  revision "2026-03-17" {
+    description
+      "Add enable-aigp to BGP address families in neighbors and peer-groups.";
+    reference "4.7.0";
+  }
 
   revision "2025-03-26" {
     description
@@ -1453,5 +1459,97 @@ module openconfig-network-instance {
         in the network instance";
     }
   }
+
+  grouping ni-bgp-afi-aigp-config {
+    description
+      "Grouping for enable-aigp leaf";
+    leaf enable-aigp {
+      type boolean;
+      description
+        "Flag to enable sending / receiving accumulated IGP
+        attribute in routing updates for the address family.";
+    }
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:neighbors/oc-netinst:neighbor/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv4-unicast/oc-netinst:config" {
+    description
+      "Add enable-aigp to BGP neighbor IPv4 unicast config";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:neighbors/oc-netinst:neighbor/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv4-unicast/oc-netinst:state" {
+    description
+      "Add enable-aigp to BGP neighbor IPv4 unicast state";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:neighbors/oc-netinst:neighbor/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv6-unicast/oc-netinst:config" {
+    description
+      "Add enable-aigp to BGP neighbor IPv6 unicast config";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:neighbors/oc-netinst:neighbor/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv6-unicast/oc-netinst:state" {
+    description
+      "Add enable-aigp to BGP neighbor IPv6 unicast state";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:peer-groups/oc-netinst:peer-group/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv4-unicast/oc-netinst:config" {
+    description
+      "Add enable-aigp to BGP peer-group IPv4 unicast config";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:peer-groups/oc-netinst:peer-group/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv4-unicast/oc-netinst:state" {
+    description
+      "Add enable-aigp to BGP peer-group IPv4 unicast state";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:peer-groups/oc-netinst:peer-group/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv6-unicast/oc-netinst:config" {
+    description
+      "Add enable-aigp to BGP peer-group IPv6 unicast config";
+    uses ni-bgp-afi-aigp-config;
+  }
+
+  augment "/oc-netinst:network-instances/oc-netinst:network-instance/" +
+          "oc-netinst:protocols/oc-netinst:protocol/oc-netinst:bgp/" +
+          "oc-netinst:peer-groups/oc-netinst:peer-group/" +
+          "oc-netinst:afi-safis/oc-netinst:afi-safi/" +
+          "oc-netinst:ipv6-unicast/oc-netinst:state" {
+    description
+      "Add enable-aigp to BGP peer-group IPv6 unicast state";
+    uses ni-bgp-afi-aigp-config;
+  }
+
   uses network-instance-top;
 }