Skip to content

Prevent Portchannel Overlap for Internal and External Portchannel #4576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdosi merged 16 commits into from
Oct 28, 2021
Merged

Prevent Portchannel Overlap for Internal and External Portchannel #4576

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
febcacd
Added test case to verify ebtables rules.
abdosi Feb 6, 2021
9582616
Merge remote-tracking branch 'upstream/master'
abdosi Feb 9, 2021
940ebe4
Merge remote-tracking branch 'upstream/master'
abdosi Feb 28, 2021
36feb13
Merge remote-tracking branch 'upstream/master'
abdosi Mar 9, 2021
ab4beee
Merge remote-tracking branch 'upstream/master'
abdosi Mar 16, 2021
8d59326
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
fa03609
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
532639a
Merge remote-tracking branch 'upstream/master'
abdosi May 14, 2021
0833669
Merge remote-tracking branch 'upstream/master'
abdosi Jun 28, 2021
f2dbf92
Merge remote-tracking branch 'upstream/master'
abdosi Oct 4, 2021
915dc97
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
1aacc7a
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
6ca8577
Merge remote-tracking branch 'upstream/master'
abdosi Oct 13, 2021
7ad4900
Merge remote-tracking branch 'upstream/master'
abdosi Oct 27, 2021
a6d5c16
Fix to avoid overlap of Front Port Channel and Internal Pot Channel
abdosi Oct 27, 2021
459bda0
Address Review comment
abdosi Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ansible/templates/minigraph_dpg_asic.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,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{{ ((index+1)|string).zfill(2) }}</Name>
<Name>PortChannel{{ ((index+1)|string).zfill(4) }}</Name>
<AttachTo>{{ port_channel_intf }}</AttachTo>
<SubInterface/>
</PortChannel>
Expand Down Expand Up @@ -142,7 +142,7 @@
<IPInterface>
<Name i:nil="true"/>
{% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][dut_index|int]|lower %}
<AttachTo>PortChannel{{ ((index+1) |string).zfill(2) }}</AttachTo>
<AttachTo>PortChannel{{ ((index+1) |string).zfill(4) }}</AttachTo>
{% else %}
<AttachTo>{{ front_panel_asic_ifnames[vm_topo_config['vm'][vms[index]]['interface_indexes'][dut_index|int][0]] }}</AttachTo>
{% endif %}
Expand All @@ -151,7 +151,7 @@
<IPInterface>
<Name i:Name="true"/>
{% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][dut_index|int]|lower %}
<AttachTo>PortChannel{{ ((index+1) |string).zfill(2) }}</AttachTo>
<AttachTo>PortChannel{{ ((index+1) |string).zfill(4) }}</AttachTo>
{% else %}
<AttachTo>{{ front_panel_asic_ifnames[vm_topo_config['vm'][vms[index]]['interface_indexes'][dut_index|int][0]] }}</AttachTo>
{% endif %}
Expand Down Expand Up @@ -267,7 +267,7 @@
{%- for index in range(vms_number) %}
{% if vms[index] in vm_asic_ifnames and vm_asic_ifnames[vms[index]][0].split('-')[1] == asic_name %}
{% if 'port-channel' in vm_topo_config['vm'][vms[index]]['ip_intf'][0]|lower %}
{% set a_intf = 'PortChannel' + ((index+1) |string).zfill(2) %}
{% set a_intf = 'PortChannel' + ((index+1) |string).zfill(4) %}
{{- acl_intfs.append(a_intf) -}}
{% endif %}
{% endif %}
Expand Down