Skip to content

Add 't0-56' testbed_type for fib_test. #1058

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

Closed
iris00522 wants to merge 2 commits into from
Closed

Add 't0-56' testbed_type for fib_test. #1058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a287cc3
Add 't0-56' testbed_type for fib_test.
iris00522 Aug 8, 2019
218a26e
conflict fixed
iris00522 Feb 13, 2020
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
7 changes: 6 additions & 1 deletion ansible/roles/test/templates/fib.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
::/0 {% for ifname, v in minigraph_neighbors.iteritems() %}
{% if "T2" in v.name %}{{ '[%d]' % minigraph_port_indices[ifname]}}{% if not loop.last %} {% endif %}{% endif %}{% endfor %}

{% elif testbed_type == 't0' or testbed_type == 't0-52'or testbed_type == 't0-64' or testbed_type == 't1-lag' or testbed_type == 't0-64-32' %}
{% elif testbed_type == 't0' or testbed_type == 't0-52'or testbed_type == 't0-56'or testbed_type == 't0-64' or testbed_type == 't1-lag' or testbed_type == 't0-64-32' %}
0.0.0.0/0 {% for portchannel, v in minigraph_portchannels.iteritems() %}
[{% for member in v.members %}{{ '%d' % minigraph_port_indices[member]}}{% if not loop.last %} {% endif %}{% endfor %}]{% if not loop.last %} {% endif %}{% endfor %}

Expand Down Expand Up @@ -42,7 +42,12 @@
{% elif (testbed_type == 't1-64-lag') or (testbed_type == 't1-64-lag-clet') %}
192.168.{{ podset }}.{{ tor * 16 + subnet }}/32 [0 1] [4 5] [16 17] [20 21]
20C0:A8{{ '%02X' % podset }}:0:{{ '%02X' % (tor * 16 + subnet)}}::/64 [0 1] [4 5] [16 17] [20 21]
<<<<<<< HEAD

{% elif testbed_type == 't0' or testbed_type == 't0-64' or testbed_type == 't0-64-32' or testbed_type == 't0-56'%}
=======
{% elif testbed_type == 't0' or testbed_type == 't0-52' or testbed_type == 't0-64' or testbed_type == 't0-64-32' %}
>>>>>>> sonic/master
{% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
(tor * props.max_tor_subnet_number * props.tor_subnet_size) +
(subnet * props.tor_subnet_size) ) %}
Expand Down