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

Jump to bottom

[test_fgnhg] Test enhancement for link operational change and matchmode changes to fine grained ECMP #2670

Merged
merged 8 commits into from
Apr 6, 2021
Merged

[test_fgnhg] Test enhancement for link operational change and matchmode changes to fine grained ECMP #2670

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0987ff
Initial link oper state handling changes
anish-n Dec 15, 2020
63034b2
Improve test logging and other misc improvements
anish-n Dec 15, 2020
6594039
Add pseudo route/link flap test
anish-n Feb 1, 2021
298a5bf
Add FG matchmode changes
anish-n Feb 18, 2021
337dded
Add support for warm boot in the ptf test, warm boot is not triggered…
anish-n Mar 17, 2021
013ce50
Incorporate review comment to have a separate ptf runner function for…
anish-n Mar 31, 2021
5097deb
Incorporate review comments and fix lgtm warnings
anish-n Mar 31, 2021
e2c17ba
Fix import LGTM alert
anish-n Apr 1, 2021
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
43 changes: 21 additions & 22 deletions ansible/roles/test/files/ptftests/fg_ecmp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def log(self, message):
logging.info(message)


def trigger_mac_learning(self, ip_to_port):
for src_ip, src_port in ip_to_port.items():
def trigger_mac_learning(self, exp_ports):
for src_port in exp_ports:
pkt = simple_eth_packet(
eth_dst=self.router_mac,
eth_src=self.dataplane.get_mac(0, src_port),
Expand Down Expand Up @@ -90,7 +90,6 @@ def setUp(self):
self.exp_port_set_two = graph['bank_1_port']
self.dst_ip = graph['dst_ip']
self.router_mac = graph['dut_mac']
self.ip_to_port = graph['ip_to_port']
self.num_flows = graph['num_flows']
self.inner_hashing = graph['inner_hashing']

Expand All @@ -101,12 +100,11 @@ def setUp(self):
self.log(self.dst_ip)
self.log(self.router_mac)
self.log(self.test_case)
self.log(self.ip_to_port)
self.log(self.num_flows)
self.log(self.inner_hashing)
self.log(self.exp_flow_count)

self.trigger_mac_learning(self.ip_to_port)
self.trigger_mac_learning(self.exp_ports)
time.sleep(3)


Expand Down Expand Up @@ -231,6 +229,7 @@ def fg_ecmp(self):
hit_count_map[port_idx] = hit_count_map.get(port_idx, 0) + 1
if port_idx == self.add_nh_port:
assert (port in add_port_grp)
tuple_to_port_map[src_ip] = port_idx
else:
assert port_idx == port

Expand Down Expand Up @@ -364,25 +363,26 @@ def send_rcv_ipv6_pkt(self, in_port, sport, dport,
src_mac = self.dataplane.get_mac(0, in_port)
rand_int = random.randint(1, 254)


if self.inner_hashing:
pkt = simple_tcp_packet(
eth_dst=self.router_mac,
eth_src=src_mac,
ip_src=ip_src,
ip_dst=ip_dst,
tcp_sport=sport,
tcp_dport=dport,
ip_ttl=64)
eth_dst=self.router_mac,
eth_src=src_mac,
ip_src=ip_src,
ip_dst=ip_dst,
tcp_sport=sport,
tcp_dport=dport,
ip_ttl=64)
pkt = simple_vxlanv6_packet(
eth_dst=self.router_mac,
eth_src=src_mac,
ipv6_src='2:2:2::' + str(rand_int),
ipv6_dst=self.dst_ip,
udp_sport=rand_int,
udp_dport=4789,
vxlan_vni=rand_int,
with_udp_chksum=False,
inner_frame=pkt)
eth_dst=self.router_mac,
eth_src=src_mac,
ipv6_src='2:2:2::' + str(rand_int),
ipv6_dst=self.dst_ip,
udp_sport=rand_int,
udp_dport=4789,
vxlan_vni=rand_int,
with_udp_chksum=False,
inner_frame=pkt)
else:
pkt = simple_tcpv6_packet(
eth_dst=self.router_mac,
Expand All @@ -403,7 +403,6 @@ def send_rcv_ipv6_pkt(self, in_port, sport, dport,
return verify_packet_any_port(self, masked_exp_pkt, dst_port_list)


#---------------------------------------------------------------------
def runTest(self):
# Main function which triggers all the tests
self.fg_ecmp()
Loading