From fc3d0c3f7ca95fe898ce50c30d16baaef7773027 Mon Sep 17 00:00:00 2001 From: Shuotian Cheng Date: Fri, 7 Apr 2017 04:58:58 +0000 Subject: [PATCH] [FIB test]: Update FIB test to support t1-lag topology --- ansible/roles/test/files/ptftests/fib_test.py | 5 ++++- ansible/roles/test/tasks/fib.yml | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/test/files/ptftests/fib_test.py b/ansible/roles/test/files/ptftests/fib_test.py index e4b77feccd0..c33f88ff1fa 100644 --- a/ansible/roles/test/files/ptftests/fib_test.py +++ b/ansible/roles/test/files/ptftests/fib_test.py @@ -89,6 +89,9 @@ def setUp(self): elif self.testbed == 't1': self.source_port_list = range(0,32) self.dest_port_list = [[i] for i in range(0,16)] + elif self.testbed == 't1-lag': + self.source_port_list = range(0,32) + self.dest_port_list = [[i, i+1] for i in range(0,16,2)] #--------------------------------------------------------------------- def load_route_info(self, route_info_path): @@ -201,7 +204,7 @@ def check_ipv4_route(self, source_port_index, dest_ip_addr, destination_port_lis if not received: logging.error("Packet sent from %d to %s...Failed" % (source_port_index, dest_ip_addr)) - assert(False) + assert(False) # Fail the test immediately else: logging.debug("Packet sent from %d to %s...OK received at %d" % (source_port_index, dest_ip_addr, received_port_index)) diff --git a/ansible/roles/test/tasks/fib.yml b/ansible/roles/test/tasks/fib.yml index 73b6d87aa66..f14dbd604a4 100644 --- a/ansible/roles/test/tasks/fib.yml +++ b/ansible/roles/test/tasks/fib.yml @@ -11,9 +11,6 @@ - include_vars: "vars/topo_{{testbed_type}}.yml" -- debug: msg="{{minigraph_port_indices}}" -- debug: msg="{{minigraph_interfaces}}" - - name: Expand properties into props set_fact: props="{{configuration_properties['spine']}}" when: testbed_type in ['t1', 't1-lag']