Skip to content

[dhcp_relay] Set Broadcast flag for all test packets #1030

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
jleveque merged 2 commits into from
Aug 1, 2019
Merged

[dhcp_relay] Set Broadcast flag for all test packets #1030

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c6dacc
Update dhcp_relay_test.py
bbinxie Jul 24, 2019
a5793a5
Update dhcp_relay_test.py
bbinxie Aug 1, 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
19 changes: 11 additions & 8 deletions ansible/roles/test/files/ptftests/dhcp_relay_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def tearDown(self):
"""

def create_dhcp_discover_packet(self):
return testutils.dhcp_discover_packet(eth_client=self.client_mac)
return testutils.dhcp_discover_packet(eth_client=self.client_mac, set_broadcast_bit=True)

def create_dhcp_discover_relayed_packet(self):
my_chaddr = ''.join([chr(int(octet, 16)) for octet in self.client_mac.split(':')])
Expand Down Expand Up @@ -183,7 +183,7 @@ def create_dhcp_discover_relayed_packet(self):
hops=1,
xid=0,
secs=0,
flags=0,
flags=0x8000,
ciaddr=self.DEFAULT_ROUTE_IP,
yiaddr=self.DEFAULT_ROUTE_IP,
siaddr=self.DEFAULT_ROUTE_IP,
Expand Down Expand Up @@ -212,7 +212,8 @@ def create_dhcp_offer_packet(self):
ip_gateway=self.relay_iface_ip,
netmask_client=self.client_subnet,
dhcp_lease=self.LEASE_TIME,
padding_bytes=0)
padding_bytes=0,
set_broadcast_bit=True)

def create_dhcp_offer_relayed_packet(self):
my_chaddr = ''.join([chr(int(octet, 16)) for octet in self.client_mac.split(':')])
Expand All @@ -233,7 +234,7 @@ def create_dhcp_offer_relayed_packet(self):
hops=0,
xid=0,
secs=0,
flags=0,
flags=0x8000,
ciaddr=self.DEFAULT_ROUTE_IP,
yiaddr=self.client_ip,
siaddr=self.server_ip,
Expand All @@ -257,7 +258,8 @@ def create_dhcp_offer_relayed_packet(self):
def create_dhcp_request_packet(self):
return testutils.dhcp_request_packet(eth_client=self.client_mac,
ip_server=self.server_ip,
ip_requested=self.client_ip)
ip_requested=self.client_ip,
set_broadcast_bit=True)

def create_dhcp_request_relayed_packet(self):
my_chaddr = ''.join([chr(int(octet, 16)) for octet in self.client_mac.split(':')])
Expand All @@ -279,7 +281,7 @@ def create_dhcp_request_relayed_packet(self):
hops=1,
xid=0,
secs=0,
flags=0,
flags=0x8000,
ciaddr=self.DEFAULT_ROUTE_IP,
yiaddr=self.DEFAULT_ROUTE_IP,
siaddr=self.DEFAULT_ROUTE_IP,
Expand Down Expand Up @@ -310,7 +312,8 @@ def create_dhcp_ack_packet(self):
ip_gateway=self.relay_iface_ip,
netmask_client=self.client_subnet,
dhcp_lease=self.LEASE_TIME,
padding_bytes=0)
padding_bytes=0,
set_broadcast_bit=True)

def create_dhcp_ack_relayed_packet(self):
my_chaddr = ''.join([chr(int(octet, 16)) for octet in self.client_mac.split(':')])
Expand All @@ -331,7 +334,7 @@ def create_dhcp_ack_relayed_packet(self):
hops=0,
xid=0,
secs=0,
flags=0,
flags=0x8000,
ciaddr=self.DEFAULT_ROUTE_IP,
yiaddr=self.client_ip,
siaddr=self.server_ip,
Expand Down