Skip to content

Commit

Permalink
Add t0-120 topology (#2867)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sumukhatv
sumukhatv authored Jan 27, 2021
1 parent 15793fb commit ca14e1b
Show file tree
Hide file tree
Showing 5 changed files with 348 additions and 48 deletions.
1 change: 1 addition & 0 deletions ansible/roles/eos/templates/t0-120-leaf.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
t0-116-leaf.j2
2 changes: 2 additions & 0 deletions ansible/roles/test/files/ptftests/dir_bcast_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ def setUp(self):
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(24, 32)
if self.test_params['testbed_type'] == 't0-120':
self.src_ports = [48, 49, 54, 55, 60, 61, 66, 67]

#---------------------------------------------------------------------

Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/test/files/ptftests/fib_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ def setUp(self):
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, 120)
if self.test_params['testbed_type'] == 't0-120':
down_ports = [7, 15, 23, 31, 39, 47, 53, 59, 65, 71, 77, 79, 81, 83, 87, 88, 91, 95, 96, 98, 102, 103, 111, 119]
all_ports = range(0, 120)
self.src_ports = [i for i in all_ports if i not in down_ports]
#---------------------------------------------------------------------

def check_required_params(self):
Expand Down
96 changes: 48 additions & 48 deletions ansible/roles/test/vars/testcases.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ testcases:

bgp_fact:
filename: bgp_fact.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]

bgp_multipath_relax:
filename: bgp_multipath_relax.yml
Expand All @@ -37,19 +37,19 @@ testcases:

bgp_speaker:
filename: bgp_speaker.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
testbed_type:

config:
filename: config.yml
topologies: [t1-lag, t1-64-lag, t1-64-lag-clet, t0, t0-64, t0-116]
topologies: [t1-lag, t1-64-lag, t1-64-lag-clet, t0, t0-64, t0-116, t0-120]

continuous_reboot:
filename: continuous_reboot.yml
vtestbed_compatible: no
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]

copp:
filename: copp.yml
Expand All @@ -59,15 +59,15 @@ testcases:

decap:
filename: decap.yml
topologies: [t1, t1-lag, t1-64-lag, t1-64-lag-clet, t0, t0-52, t0-56, t0-64, t0-116]
topologies: [t1, t1-lag, t1-64-lag, t1-64-lag-clet, t0, t0-52, t0-56, t0-64, t0-116, t0-120]
required_vars:
ptf_host:
testbed_type:
dscp_mode:

dhcp_relay:
filename: dhcp_relay.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:

Expand All @@ -85,138 +85,138 @@ testcases:
fast-reboot:
filename: fast-reboot.yml
vtestbed_compatible: no
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
vm_hosts:

warm-reboot:
filename: warm-reboot.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-sad:
filename: warm-reboot-sad.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-multi-sad:
filename: warm-reboot-multi-sad.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-multi-sad-inboot:
filename: warm-reboot-multi-sad-inboot.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t0-56]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-56]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-sad-bgp:
filename: warm-reboot-sad-bgp.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116, t0-56]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-56]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-sad-lag:
filename: warm-reboot-sad-lag.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116, t0-56]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-56]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-sad-lag-member:
filename: warm-reboot-sad-lag-member.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116, t0-56]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-56]
required_vars:
ptf_host:
vm_hosts:

warm-reboot-sad-vlan-port:
filename: warm-reboot-sad-vlan-port.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116, t0-56]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-56]
required_vars:
ptf_host:
vm_hosts:

fib:
filename: simple-fib.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
required_vars:
ptf_host:
testbed_type:

hash:
filename: hash.yml
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
required_vars:
ptf_host:
testbed_type:

warm-reboot-fib:
filename: warm-reboot-fib.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
required_vars:
ptf_host:
testbed_type:

fdb:
filename: fdb.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
testbed_type:

fdb_mac_expire:
filename: fdb_mac_expire.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t0-52]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t0-52]
required_vars:
fdb_aging_time:
ptf_host:
testbed_type:

dir_bcast:
filename: dir_bcast.yml
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:
testbed_type:

lag_2:
filename: lag_2.yml
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1-lag, t1-64-lag, t1-64-lag-clet]
required_vars:
ptf_host:
testbed_type:

lldp:
filename: lldp.yml
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-116, t0-64-32, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-116, t0-120, t0-64-32, t1, t1-lag, t1-64-lag, t1-64-lag-clet]

link_flap:
filename: link_flap.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

continuous_link_flap:
filename: continuous_link_flap.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]

mtu:
filename: mtu.yml
Expand All @@ -233,109 +233,109 @@ testcases:

neighbour_mac_noptf:
filename: neighbour-mac-noptf.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

ntp:
filename: ntp.yml
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

pfc_wd:
filename: pfc_wd.yml
vtestbed_compatible: no
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

portstat:
filename: portstat.yml
topologies: [t0, t0-16, t0-56, t0-64, t0-116, t1]
topologies: [t0, t0-16, t0-56, t0-64, t0-116, t0-120, t1]

port_toggle:
filename: port_toggle.yml
vtestbed_compatible: no
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

qos_sai:
filename: qos_sai.yml
topologies: [ptf32, ptf64, t1, t1-lag, t0, t0-64, t0-116]
topologies: [ptf32, ptf64, t1, t1-lag, t0, t0-64, t0-116, t0-120]

reboot:
filename: reboot.yml
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

repeat_harness:
filename: repeat_harness.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

restart_swss:
filename: run_config_cleanup.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

restart_swss_service:
filename: restart_swss.yml
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

restart_syncd:
filename: restart_syncd.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

sensors:
filename: sensors_check.yml
vtestbed_compatible: no
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

service_acl:
filename: service_acl.yml
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

snmp:
filename: snmp.yml
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

syslog:
filename: syslog.yml
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet, ptf32, ptf64]

vlan:
filename: vlantb.yml
topologies: [t0, t0-16, t0-116]
topologies: [t0, t0-16, t0-116, t0-120]
required_vars:
ptf_host:
testbed_type:

crm:
filename: crm.yml
topologies: [t1, t1-lag, t0, t0-52, t0-56, t0-64, t0-116]
topologies: [t1, t1-lag, t0, t0-52, t0-56, t0-64, t0-116, t0-120]

dip_sip:
filename: dip_sip.yml
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t0-120, t1, t1-lag, t1-64-lag, t1-64-lag-clet]
required_vars:
ptf_host:
testbed_type:

vxlan_decap:
filename: vxlan-decap.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:

wr_arp:
filename: wr_arp.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:

vnet_vxlan:
filename: vnet_vxlan.yml
vtestbed_compatible: no
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-52, t0-56, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:

warm_reboot_vnet:
filename: warm-reboot-vnet.yml
topologies: [t0, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-64, t0-64-32, t0-116, t0-120]
required_vars:
ptf_host:

Expand All @@ -345,7 +345,7 @@ testcases:

iface_mode:
filename: iface_naming_mode.yml
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, ptf32, ptf64]
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t0-120, t1, ptf32, ptf64]
required_vars:
testbed_type:

Expand Down
Loading

0 comments on commit ca14e1b

Please sign in to comment.