Skip to content

Finalize T0-116 topology #381

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
yxieca merged 6 commits into from
Dec 8, 2017
Merged

Finalize T0-116 topology #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef3ec35
[arista7260cx3] define t0-116 port map to match production
yxieca Dec 8, 2017
4450326
[arista7260cx3] udpate fdb test port map
yxieca Nov 8, 2017
dc6bfac
[arista7260cx3] update fib test port layout
yxieca Nov 8, 2017
9212314
[arista7260cx3] enable IPinIP test
yxieca Nov 9, 2017
a16b95a
[arista7260cx3] allowing bgp_speaker to run on topology t0-116
yxieca Dec 4, 2017
9fd06a8
[arista7260cx3] define T0-116 production port map in minigraph_facts.py
yxieca Dec 8, 2017
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
2 changes: 1 addition & 1 deletion ansible/library/minigraph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ def parse_xml(filename, hostname):
all_ports = [ x for x in range(1, 65)]

# 100G ports
s100G_ports = [ x for x in range(45, 53) ]
s100G_ports = [ x for x in range(13, 21) ]

# 50G ports
s50g_ports = list(set(all_ports) - set(s100G_ports))
Expand Down
4 changes: 3 additions & 1 deletion ansible/roles/test/files/ptftests/IP_decap_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Design is available in https://github.com/Azure/SONiC/wiki/IPv4-Decapsulation-test

Precondition: Before the test start, all routes need to be defined as in the fib_info.txt file, in addition to the decap rule that need to be set as the dspc_mode
topology: SUpports t1, t1-lag and t0 topology
topology: SUpports t1, t1-lag, t0-116 and t0 topology

Usage: Examples of how to start the test
ptf --test-dir /root/dor/ ip_decap_test_red --platform remote -t "verbose=True;fib_info='/root/fib_info.txt';lo_ip='10.1.0.32';router_mac='00:02:03:04:05:00';dscp_mode='pipe'; testbed_type='t1'" --log-dir /tmp/logs --verbose
Expand Down Expand Up @@ -62,6 +62,8 @@ def setUp(self):
self.src_ports = range(0, 32)
if self.test_params['testbed_type'] == 't0':
self.src_ports = range(1, 25) + range(28, 32)
if self.test_params['testbed_type'] == 't0-116':
self.src_ports = range(0, 24) + range(32, 120)
#-----------------------------------------------------------------

def send_and_verify(self, dst_ip, expected_ports, src_port, triple_encap = False):
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/test/files/ptftests/fib_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def setUp(self):
if self.test_params['testbed_type'] == 't0-64':
self.src_ports = range(0, 2) + range(4, 18) + range(20, 33) + range(36, 43) + range(48, 49) + range(52, 59)
if self.test_params['testbed_type'] == 't0-116':
self.src_ports = range(0, 17) + [18] + range(20,44) + range(52, 64)
self.src_ports = range(0, 24) + range(32, 120)
#---------------------------------------------------------------------

def check_ip_range(self, ipv4=True):
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/test/tasks/bgp_speaker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
when: (testbed_type is not defined or ptf_host is not defined)

- fail: msg="Invalid testbed_type value '{{testbed_type}}'"
when: testbed_type not in ['t0', 't0-64']
when: testbed_type not in ['t0', 't0-64', 't0-116']

- name: Gather minigraph facts about the device
minigraph_facts: host={{inventory_hostname}}
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/test/tasks/decap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
(dscp_mode is not defined)

- fail: msg="Invalid testbed_type value '{{testbed_type}}'"
when: testbed_type not in [ 't1', 't0', 't1-lag', 't1-64-lag']
when: testbed_type not in ['t1', 't0', 't1-lag', 't1-64-lag', 't0-116']

- fail: msg="Invalid testbed_type value '{{dscp_mode}}'"
when: dscp_mode not in [ 'pipe','uniform']
when: dscp_mode not in ['pipe','uniform']

- include_vars: "vars/topo_{{testbed_type}}.yml"

Expand All @@ -20,7 +20,7 @@

- name: Expand properties into props
set_fact: props="{{configuration_properties['common']}}"
when: testbed_type in ['t0']
when: testbed_type in ['t0', 't0-116']

- name: Expand properties into props
set_fact: props_tor="{{configuration_properties['tor']}}"
Expand Down
4 changes: 0 additions & 4 deletions ansible/roles/test/templates/fdb.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% for vlan in minigraph_vlan_interfaces %}
{% if testbed_type == 't0-116' %}
{{ vlan['subnet'] }} {% for n in range(0, 17) %} {{ n }} {% endfor %} 18 {% for n in range(20, 44) %} {{ n }} {% endfor %}{% for n in range(52, 64) %} {{ n }} {% endfor %}
{% else %}
{{ vlan['subnet'] }} {% for ifname in minigraph_vlans[vlan['attachto']]['members'] %} {{ minigraph_port_indices[ifname] }} {% endfor %}
{% endif %}
{% endfor %}
6 changes: 3 additions & 3 deletions ansible/roles/test/templates/fib.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% elif testbed_type == 't1-64-lag' %}
0.0.0.0/0 [0 1] [4 5] [16 17] [20 21]
{% elif testbed_type == 't0-116' %}
0.0.0.0/0 [44 45] [46 47] [48 49] [50 51]
0.0.0.0/0 [24 25] [26 27] [28 29] [30 31]
{% endif %}

{#routes to uplink#}
Expand Down Expand Up @@ -56,8 +56,8 @@
{% set prefixlen_v4 = (32 - ((props.tor_subnet_size | log(2))) | int) %}
{# Skip 192.168.0.0 as it is in Vlan1000 subnet #}
{% if octet2 != 168 and octet3 != 0 and octet4 != 0 %}
192.{{ octet2 }}.{{ octet3 }}.{{ octet4 }}/{{ prefixlen_v4 }} [44 45] [46 47] [48 49] [50 51]
20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/64 [44 45] [46 47] [48 49] [50 51]
192.{{ octet2 }}.{{ octet3 }}.{{ octet4 }}/{{ prefixlen_v4 }} [24 25] [26 27] [28 29] [30 31]
20C0:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/64 [24 25] [26 27] [28 29] [30 31]
{% endif %}
{% endif %}
{% endfor %}
Expand Down
108 changes: 82 additions & 26 deletions ansible/vars/topo_t0-116.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ topology:
- 21
- 22
- 23
- 24
- 25
- 26
- 27
- 28
- 29
- 30
- 31
- 32
- 33
- 34
Expand All @@ -44,6 +36,14 @@ topology:
- 41
- 42
- 43
- 44
- 45
- 46
- 47
- 48
- 49
- 50
- 51
- 52
- 53
- 54
Expand All @@ -56,26 +56,82 @@ topology:
- 61
- 62
- 63
- 64
- 65
- 66
- 67
- 68
- 69
- 70
- 71
- 72
- 73
- 74
- 75
- 76
- 77
- 78
- 79
- 80
- 81
- 82
- 83
- 84
- 85
- 86
- 87
- 88
- 89
- 90
- 91
- 92
- 93
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
- 105
- 106
- 107
- 108
- 109
- 110
- 111
- 112
- 113
- 114
- 115
- 116
- 117
- 118
- 119
VMs:
ARISTA01T1:
vlans:
- 44
- 45
- 24
- 25
vm_offset: 0
ARISTA02T1:
vlans:
- 46
- 47
- 26
- 27
vm_offset: 1
ARISTA03T1:
vlans:
- 48
- 49
- 28
- 29
vm_offset: 2
ARISTA04T1:
vlans:
- 50
- 51
- 30
- 31
vm_offset: 3

configuration_properties:
Expand All @@ -87,8 +143,8 @@ configuration_properties:
max_tor_subnet_number: 16
tor_subnet_size: 64
spine_asn: 65534
leaf_asn_start: 64600
tor_asn_start: 65100
leaf_asn_start: 4200064600
Copy link
Contributor

@stcheng stcheng Dec 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we using such long ASN number?

Copy link
Collaborator Author

@yxieca yxieca Dec 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am purposely testing 4-bytes ASN.

tor_asn_start: 4200065100
failure_rate: 0
nhipv4: 10.10.246.100
nhipv6: FC0A::C9
Expand All @@ -98,9 +154,9 @@ configuration:
properties:
- common
bgp:
asn: 64600
asn: 4200064600
peers:
65100:
4200065100:
- 10.0.0.32
- FC00::21
interfaces:
Expand All @@ -122,9 +178,9 @@ configuration:
properties:
- common
bgp:
asn: 64600
asn: 4200064600
peers:
65100:
4200065100:
- 10.0.0.34
- FC00::25
interfaces:
Expand All @@ -146,9 +202,9 @@ configuration:
properties:
- common
bgp:
asn: 64600
asn: 4200064600
peers:
65100:
4200065100:
- 10.0.0.36
- FC00::29
interfaces:
Expand All @@ -170,9 +226,9 @@ configuration:
properties:
- common
bgp:
asn: 64600
asn: 4200064600
peers:
65100:
4200065100:
- 10.0.0.38
- FC00::2D
interfaces:
Expand Down