Skip to content
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

Add many testcases support to t0-56 #885

Merged
merged 2 commits into from
Apr 28, 2019
Merged

Add many testcases support to t0-56 #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32828c0
Add many testcases support to t0-56
qiluo-msft Apr 23, 2019
45c3558
Fix bgp_speaker for t0-56
qiluo-msft Apr 24, 2019
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: 2 additions & 0 deletions 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 @@ -100,6 +100,8 @@ def setUp(self):
self.src_ports = [0, 1, 4, 5, 16, 17, 20, 21, 34, 36, 37, 38, 39, 42, 44, 45, 46, 47, 50, 52, 53, 54, 55, 58, 60, 61, 62, 63]
if self.test_params['testbed_type'] == 't0':
self.src_ports = range(1, 25) + range(28, 32)
if self.test_params['testbed_type'] == 't0-56':
self.src_ports = [0, 1, 4, 5, 8, 9] + range(12, 18) + [20, 21, 24, 25, 28, 29, 32, 33, 36, 37] + range(40, 46) + [48, 49, 52, 53]
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':
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 @@ -7,7 +7,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', 't0-116']
when: testbed_type not in testcases['bgp_speaker']['topologies']

- name: Gather minigraph facts about the device
minigraph_facts: host={{inventory_hostname}}
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/test/tasks/shared-fib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
when: testbed_type is not defined

- fail: msg="testbed_type {{testbed_type}} is invalid."
when: testbed_type not in ['t1-lag', 't1', 't1-64-lag', 't0', 't0-64', 't0-116']
when: testbed_type not in testcases['fib']['topologies']

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

Expand All @@ -18,7 +18,7 @@

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

- name: Expand ToR properties into props
set_fact: props_tor="{{configuration_properties['tor']}}"
Expand Down
38 changes: 19 additions & 19 deletions ansible/roles/test/vars/testcases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ testcases:

bgp_speaker:
filename: bgp_speaker.yml
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116]
required_vars:
ptf_host:
testbed_type:
Expand All @@ -37,7 +37,7 @@ testcases:

continuous_reboot:
filename: continuous_reboot.yml
topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag]
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag]

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

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

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

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

fast-reboot:
filename: fast-reboot.yml
topologies: [t0, t0-64, t0-64-32, t0-116]
topologies: [t0, t0-56, t0-64, t0-64-32, t0-116]
required_vars:
ptf_host:
vm_hosts:
Expand All @@ -86,7 +86,7 @@ testcases:

fib:
filename: simple-fib.yml
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag]
required_vars:
ptf_host:
testbed_type:
Expand All @@ -100,36 +100,36 @@ testcases:

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

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

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

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

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

mem_check:
filename: mem_check.yml
topologies: [t0, t0-16, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
topologies: [t0, t0-16, t0-56, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]

mtu:
filename: mtu.yml
Expand All @@ -150,11 +150,11 @@ testcases:

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

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

port_toggle:
filename: port_toggle.yml
Expand All @@ -166,7 +166,7 @@ testcases:

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

repeat_harness:
filename: repeat_harness.yml
Expand All @@ -186,19 +186,19 @@ testcases:

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

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

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

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

vlan:
filename: vlantb.yml
Expand Down