Skip to content

[advance-reboot] Separate server IP range for control and data plane traffic #4525

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
vaibhavhd merged 1 commit into from
Oct 22, 2021
Merged

[advance-reboot] Separate server IP range for control and data plane traffic #4525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions ansible/roles/test/files/ptftests/advanced-reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ def timeout(self, func, seconds, message):

def generate_vlan_servers(self):
vlan_host_map = defaultdict(dict)
self.vlan_host_ping_map = defaultdict(dict)
self.nr_vl_pkts = 0 # Number of packets from upper layer
for vlan, prefix in self.vlan_ip_range.items():
if not self.ports_per_vlan[vlan]:
Expand All @@ -348,14 +349,23 @@ def generate_vlan_servers(self):

vlan_host_map[port][addr] = mac

for counter, i in enumerate(
xrange(n_hosts+2, n_hosts+2+len(self.ports_per_vlan[vlan])), start=n_hosts):
mac = self.VLAN_BASE_MAC_PATTERN.format(counter)
port = self.ports_per_vlan[vlan][i % len(self.ports_per_vlan[vlan])]
addr = self.host_ip(prefix, i)
self.vlan_host_ping_map[port][addr] = mac

self.nr_vl_pkts += n_hosts

return vlan_host_map

def generate_arp_responder_conf(self, vlan_host_map):
arp_responder_conf = {}
for port in vlan_host_map:
arp_responder_conf['eth{}'.format(port)] = vlan_host_map[port]
arp_responder_conf['eth{}'.format(port)] = {}
arp_responder_conf['eth{}'.format(port)].update(vlan_host_map[port])
arp_responder_conf['eth{}'.format(port)].update(self.vlan_host_ping_map[port])

return arp_responder_conf

Expand Down Expand Up @@ -717,9 +727,9 @@ def generate_from_vlan(self):
def generate_ping_dut_lo(self):
self.ping_dut_packets = []
dut_lo_ipv4 = self.test_params['lo_prefix'].split('/')[0]
for src_port in self.vlan_host_map:
src_addr = random.choice(self.vlan_host_map[src_port].keys())
src_mac = self.hex_to_mac(self.vlan_host_map[src_port][src_addr])
for src_port in self.vlan_host_ping_map:
src_addr = random.choice(self.vlan_host_ping_map[src_port].keys())
src_mac = self.hex_to_mac(self.vlan_host_ping_map[src_port][src_addr])
packet = simple_icmp_packet(eth_src=src_mac,
eth_dst=self.dut_mac,
ip_src=src_addr,
Expand Down