Skip to content

Commit 6968540

Browse files
yxiecalguohan
authored andcommitted
[VM config] skip podset 0 tor 0 routing entry (#545)
In our test, we are simulating tor-0 switch at potset 0. The VM (simulating T1 swtich) shouldn't advertise our routing entry back to us.
1 parent cb20cd9 commit 6968540

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

ansible/roles/eos/templates/t0-64-32-leaf.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ route-map DEFAULT_ROUTES permit
3737
{% for podset in range(0, props.podset_number) %}
3838
{% for tor in range(0, props.tor_number) %}
3939
{% for subnet in range(0, props.tor_subnet_number) %}
40+
{# Skip tor 0 podset 0 #}
41+
{% if podset != 0 or tor != 0 %}
4042
{% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
4143
(tor * props.max_tor_subnet_number * props.tor_subnet_size) +
4244
(subnet * props.tor_subnet_size) ) %}
@@ -46,12 +48,15 @@ route-map DEFAULT_ROUTES permit
4648
{% set prefixlen_v4 = (32 - ((props.tor_subnet_size | log(2))) | int) %}
4749
ip route 192.{{ octet2 }}.{{ octet3 }}.{{ octet4 }}/{{ prefixlen_v4 }} {{ props.nhipv4 }}
4850
ipv6 route 20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/64 {{ props.nhipv6 }}
51+
{% endif %}
4952
{% endfor %}
5053
{% endfor %}
5154
{% endfor %}
5255
!
5356
{% for podset in range(0, props.podset_number) %}
5457
{% for tor in range(0, props.tor_number) %}
58+
{# Skip tor 0 podset 0 #}
59+
{% if podset != 0 or tor != 0 %}
5560
{% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
5661
(tor * props.max_tor_subnet_number * props.tor_subnet_size) ) %}
5762
{% set octet2 = (168 + ((suffix // (256 ** 2))) % 256) %}
@@ -63,6 +68,7 @@ ip prefix-list test_ipv4_{{ podset}}_{{ tor }} seq 10 permit 192.{{ octet2 }}.{{
6368
ipv6 prefix-list test_ipv6_{{ podset}}_{{ tor }}
6469
seq 10 permit 20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/{{ prefixlen_v6 }} ge {{ prefixlen_v6 }}
6570
exit
71+
{% endif %}
6672
{% endfor %}
6773
{% endfor %}
6874
!

ansible/roles/eos/templates/t0-leaf.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ route-map DEFAULT_ROUTES permit
3737
{% for podset in range(0, props.podset_number) %}
3838
{% for tor in range(0, props.tor_number) %}
3939
{% for subnet in range(0, props.tor_subnet_number) %}
40+
{# Skip tor 0 podset 0 #}
41+
{% if podset != 0 or tor != 0 %}
4042
{% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
4143
(tor * props.max_tor_subnet_number * props.tor_subnet_size) +
4244
(subnet * props.tor_subnet_size) ) %}
@@ -46,12 +48,15 @@ route-map DEFAULT_ROUTES permit
4648
{% set prefixlen_v4 = (32 - ((props.tor_subnet_size | log(2))) | int) %}
4749
ip route 192.{{ octet2 }}.{{ octet3 }}.{{ octet4 }}/{{ prefixlen_v4 }} {{ props.nhipv4 }}
4850
ipv6 route 20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/64 {{ props.nhipv6 }}
51+
{% endif %}
4952
{% endfor %}
5053
{% endfor %}
5154
{% endfor %}
5255
!
5356
{% for podset in range(0, props.podset_number) %}
5457
{% for tor in range(0, props.tor_number) %}
58+
{# Skip tor 0 podset 0 #}
59+
{% if podset != 0 or tor != 0 %}
5560
{% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
5661
(tor * props.max_tor_subnet_number * props.tor_subnet_size) ) %}
5762
{% set octet2 = (168 + ((suffix // (256 ** 2))) % 256) %}
@@ -63,6 +68,7 @@ ip prefix-list test_ipv4_{{ podset}}_{{ tor }} seq 10 permit 192.{{ octet2 }}.{{
6368
ipv6 prefix-list test_ipv6_{{ podset}}_{{ tor }}
6469
seq 10 permit 20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/{{ prefixlen_v6 }} ge {{ prefixlen_v6 }}
6570
exit
71+
{% endif %}
6672
{% endfor %}
6773
{% endfor %}
6874
!

0 commit comments

Comments
 (0)