Fix for port channel names mismatch in global and asic minigraph template files sonic-net#18529

Description of PR
Summary:
Fixes # (issue)

This PR fixes the issue Bug: Minigraph generation is broken for multi asic sonic-net#18507 caused by chore: change portchannel naming sonic-net#18161
Portchannel name changes are done in file ansible/templates/minigraph_dpg.j2 but we need corresponding change in ansible/templates/minigraph_dpg_asic.j2 file as well so the names are same in both global and asic configs.
Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
 Test case improvement
Back port request
 202012
 202205
 202305
 202311
 202405
 202411
Approach
What is the motivation for this PR?
To fix the minigraph template issues w.r.t Portchannel names for global and asic.
How did you do it?
Add corresponding changes on ansible/templates/minigraph_dpg_asic.j2 similar to ansible/templates/minigraph_dpg.j2
How did you verify/test it?
Run gen-mg with the new template modifications. With the new minigraph, made sure tests are passing for multi-asics

Co-authored-by: ansrajpu <[email protected]>
Signed-off-by: Guy Shemesh <[email protected]>

Author: 2 people

ansible/templates/minigraph_dpg_asic.j2

@@ -96,7 +96,7 @@
 {% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][dut_index|int]|lower %}
 {% set port_channel_intf=';'.join(vm_asic_ifnames[vms[index]])  %}
         <PortChannel>
-          <Name>PortChannel{{ '10' + ((index+1)|string) }}</Name>
+          <Name>PortChannel{{ (100 + index + 1)|string }}</Name>
           <AttachTo>{{ port_channel_intf }}</AttachTo>
           <SubInterface/>
         </PortChannel>
@@ -144,7 +144,7 @@
         <IPInterface>
           <Name i:nil="true"/>
 {% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][dut_index|int][intf_index]|lower %}
-          <AttachTo>PortChannel{{ '10' + ((index+1)|string) }}</AttachTo>
+          <AttachTo>PortChannel{{ (100 + index + 1)|string }}</AttachTo>
 {% else %}
           <AttachTo>{{ front_panel_asic_ifnames[vm_topo_config['vm'][vms[index]]['interface_indexes'][dut_index|int][0]] }}</AttachTo>
 {% endif %}
@@ -153,7 +153,7 @@
         <IPInterface>
           <Name i:Name="true"/>
 {% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][dut_index|int][intf_index]|lower %}
-          <AttachTo>PortChannel{{ '10' + ((index+1)|string) }}</AttachTo>
+          <AttachTo>PortChannel{{ (100 + index + 1)|string }}</AttachTo>
 {% else %}
           <AttachTo>{{ front_panel_asic_ifnames[vm_topo_config['vm'][vms[index]]['interface_indexes'][dut_index|int][0]] }}</AttachTo>
 {% endif %}
@@ -271,7 +271,7 @@
 {%- for index in range(vms_number) %}
 {% if vms[index] in vm_asic_ifnames and vm_asic_ids[vms[index]][0] == asic_name %}
 {% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][0]|lower %}
-{% set a_intf = 'PortChannel' + '10' + ((index+1)|string) %}
+{% set a_intf = 'PortChannel' ~ (100 + index + 1)|string %}
 {{- acl_intfs.append(a_intf) -}}
 {% endif %}
 {% endif %}