From 60e15daafc43d87fd7fd2b206ce6e98b04138c1b Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:50:03 -0800
Subject: [PATCH] Enhanced DPG for generating Static Route Config with
 interface name (#4906)

What I did:

Enhanced DPG for generating Static Route Config with interface name for chassis-packet.

Why I did:

As mention here:- Azure/sonic-buildimage#9707. It need support of this PR.
---
 ansible/templates/minigraph_dpg_asic.j2 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ansible/templates/minigraph_dpg_asic.j2 b/ansible/templates/minigraph_dpg_asic.j2
index 5882db283f..04b07996f2 100644
--- a/ansible/templates/minigraph_dpg_asic.j2
+++ b/ansible/templates/minigraph_dpg_asic.j2
@@ -184,18 +184,25 @@
 {% if a_linecard != inventory_hostname or idx != asic_index %}
 {%- set nexthop_intfs = [] -%}
 {%- set nexthop_v6_intfs = [] -%}
+{%- set internal_po_channel_intfs = [] -%}
 {% for asic,asic_config in asic_topo_config[all_slots[a_linecard]].items() %}
 {% if (a_linecard != inventory_hostname and asic == remote_asic_name) or (a_linecard == inventory_hostname and asic != asic_name) %}
 {% for neigh_asic in  asic_config['neigh_asic'] %}
 {% set _ = nexthop_intfs.append(asic_config['neigh_asic'][neigh_asic]['bgp_ipv4'][0]) %}
 {% set _ = nexthop_v6_intfs.append(asic_config['neigh_asic'][neigh_asic]['bgp_ipv6'][0]) %}
+{% set neigh_asic_index = neigh_asic.split('ASIC')[1]|int %}
+{% set po_intf = 'PortChannel' + port_channel_id(asic_index, neigh_asic_index).zfill(2) %}
+{{- internal_po_channel_intfs.append(po_intf) -}}
 {% endfor %}
 {% endif %}
 {% endfor %}
       <IPNextHop>
          <ElementType>IPNextHop</ElementType>
          <Name i:nil="true"/>
-         <AttachTo>{{ all_loopback4096[a_linecard][idx] }}</AttachTo>
+         <AssociatedTo>{{ all_loopback4096[a_linecard][idx] }}</AssociatedTo>
+         <AttachTo>
+{{- internal_po_channel_intfs|join(',') -}}
+         </AttachTo>
          <Type>StaticRoute</Type>
          <Advertise>false</Advertise>
          <Address>
@@ -205,7 +212,10 @@
       <IPNextHop>
          <ElementType>IPNextHop</ElementType>
          <Name i:nil="true"/>
-         <AttachTo>{{ all_loopback4096_ipv6[a_linecard][idx] }}</AttachTo>
+         <AssociatedTo>{{ all_loopback4096_ipv6[a_linecard][idx] }}</AssociatedTo>
+         <AttachTo>
+{{- internal_po_channel_intfs|join(',') -}}
+         </AttachTo>
          <Type>StaticRoute</Type>
          <Advertise>false</Advertise>
          <Address>