diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/Dhcp.py | 4 | ||||
| -rw-r--r-- | resources/libraries/python/TrafficScriptExecutor.py | 6 | ||||
| -rw-r--r-- | resources/libraries/robot/dhcp_client.robot | 97 | ||||
| -rw-r--r-- | resources/libraries/robot/dhcp_proxy.robot | 117 | ||||
| -rwxr-xr-x | resources/traffic_scripts/dhcp/send_and_check_proxy_discover.py (renamed from resources/traffic_scripts/dhcp/send_dhcp_discover.py) | 41 | ||||
| -rwxr-xr-x | resources/traffic_scripts/dhcp/send_and_check_proxy_messages.py (renamed from resources/traffic_scripts/dhcp/send_dhcp_messages.py) | 100 |
6 files changed, 193 insertions, 172 deletions
diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py index ebdfeb3b80..93a9180972 100644 --- a/resources/libraries/python/Dhcp.py +++ b/resources/libraries/python/Dhcp.py @@ -47,6 +47,10 @@ class DhcpClient(object): ' interface {}.' .format(vpp_node, interface)) + +class DhcpProxy(object): + """DHCP Proxy utilities.""" + @staticmethod def dhcp_proxy_config(vpp_node, server_address, source_address): """Set DHCP proxy. diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index e5fb2589ef..a362f45066 100644 --- a/resources/libraries/python/TrafficScriptExecutor.py +++ b/resources/libraries/python/TrafficScriptExecutor.py @@ -50,7 +50,7 @@ class TrafficScriptExecutor(object): :type timeout: int :raises RuntimeError: ICMP echo Rx timeout. :raises RuntimeError: DHCP REQUEST Rx timeout. - :raises RuntimeError: DHCP DISCOVER timeout. + :raises RuntimeError: DHCP DISCOVER Rx timeout. :raises RuntimeError: TCP/UDP Rx timeout. :raises RuntimeError: ARP reply timeout. :raises RuntimeError: Traffic script execution failed. @@ -75,8 +75,8 @@ class TrafficScriptExecutor(object): raise RuntimeError("ICMP echo Rx timeout") elif "RuntimeError: DHCP REQUEST Rx timeout" in stderr: raise RuntimeError("DHCP REQUEST Rx timeout") - elif "RuntimeError('DHCP DISCOVER timeout')" in stderr: - raise RuntimeError("DHCP DISCOVER timeout") + elif "RuntimeError: DHCP DISCOVER Rx timeout" in stderr: + raise RuntimeError("DHCP DISCOVER Rx timeout") elif "RuntimeError: TCP/UDP Rx timeout" in stderr: raise RuntimeError("TCP/UDP Rx timeout") elif "Error occurred: ARP reply timeout" in stdout: diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot index c11e01c67a..6c21fc8903 100644 --- a/resources/libraries/robot/dhcp_client.robot +++ b/resources/libraries/robot/dhcp_client.robot @@ -139,100 +139,3 @@ | | ... | --lease_time | ${lease_time} | | Run Traffic Script On Node | dhcp/check_dhcp_request_ack.py | | ... | ${tg_node} | ${args} - -| Send DHCP Messages -| | [Documentation] | Send and receive DHCP messages between client -| | ... | and server through DHCP proxy. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - tg_interface1 - TG interface. Type: string -| | ... | - tg_interface2 - TG interface. Type: string -| | ... | - server_ip - DHCP server IP address. Type: string -| | ... | - server_mac - DHCP server MAC address. Type: string -| | ... | - client_ip - Client IP address. Type: string -| | ... | - client_mac - Client MAC address. Type: string -| | ... | - proxy_ip - DHCP proxy IP address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send DHCP Messages \| ${nodes['TG']} \ -| | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \ -| | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \| -| | ... -| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} -| | ... | ${server_ip} | ${server_mac} | ${client_ip} | ${client_mac} -| | ... | ${proxy_ip} | -| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} -| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} -| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} -| | ... | --rx_if | ${tg_interface_name2} -| | ... | --server_ip | ${server_ip} -| | ... | --server_mac | ${server_mac} -| | ... | --client_ip | ${client_ip} -| | ... | --client_mac | ${client_mac} -| | ... | --proxy_ip | ${proxy_ip} -| | Run Traffic Script On Node | dhcp/send_dhcp_messages.py -| | ... | ${tg_node} | ${args} - -| Send DHCP DISCOVER -| | [Documentation] | Send and receive DHCP DISCOVER. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - tg_interface1 - TG interface. Type: string -| | ... | - tg_interface2 - TG interface. Type: string -| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string -| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \ -| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \| -| | ... -| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} -| | ... | ${tx_src_ip} | ${tx_dst_ip} | -| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} -| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} -| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} -| | ... | --rx_if | ${tg_interface_name2} -| | ... | --tx_src_ip | ${tx_src_ip} -| | ... | --tx_dst_ip | ${tx_dst_ip} -| | Run Traffic Script On Node | dhcp/send_dhcp_discover.py -| | ... | ${tg_node} | ${args} - -| Send DHCP DISCOVER should fail -| | [Documentation] | Send and receive DHCP DISCOVER should fail. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - tg_interface1 - TG interface. Type: string -| | ... | - tg_interface2 - TG interface. Type: string -| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string -| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \ -| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \| -| | ... -| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} -| | ... | ${tx_src_ip} | ${tx_dst_ip} | -| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} -| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} -| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} -| | ... | --rx_if | ${tg_interface_name2} -| | ... | --tx_src_ip | ${tx_src_ip} -| | ... | --tx_dst_ip | ${tx_dst_ip} -| | Run Keyword And Expect Error | DHCP DISCOVER timeout -| | ... | Run Traffic Script On Node | dhcp/send_dhcp_discover.py -| | ... | ${tg_node} | ${args} diff --git a/resources/libraries/robot/dhcp_proxy.robot b/resources/libraries/robot/dhcp_proxy.robot new file mode 100644 index 0000000000..0045349ad5 --- /dev/null +++ b/resources/libraries/robot/dhcp_proxy.robot @@ -0,0 +1,117 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Library | Collections +| Resource | resources/libraries/robot/default.robot +| Library | resources.libraries.python.Dhcp.DhcpProxy +| Library | resources.libraries.python.TrafficScriptExecutor +| Documentation | DHCP Proxy specific keywords. + +*** Keywords *** +| Send DHCP Messages +| | [Documentation] | Send and receive DHCP messages between client +| | ... | and server through DHCP proxy. +| | ... +| | ... | *Arguments:* +| | ... | - tg_node - TG node. Type: dictionary +| | ... | - tg_interface1 - TG interface. Type: string +| | ... | - tg_interface2 - TG interface. Type: string +| | ... | - server_ip - DHCP server IP address. Type: string +| | ... | - server_mac - DHCP server MAC address. Type: string +| | ... | - client_ip - Client IP address. Type: string +| | ... | - client_mac - Client MAC address. Type: string +| | ... | - proxy_ip - DHCP proxy IP address. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Send DHCP Messages \| ${nodes['TG']} \ +| | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \ +| | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \| +| | ... +| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} +| | ... | ${server_ip} | ${server_mac} | ${client_ip} | ${client_mac} +| | ... | ${proxy_ip} | +| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} +| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} +| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} +| | ... | --rx_if | ${tg_interface_name2} +| | ... | --server_ip | ${server_ip} +| | ... | --server_mac | ${server_mac} +| | ... | --client_ip | ${client_ip} +| | ... | --client_mac | ${client_mac} +| | ... | --proxy_ip | ${proxy_ip} +| | Run Traffic Script On Node | dhcp/send_and_check_proxy_messages.py +| | ... | ${tg_node} | ${args} + +| Send DHCP DISCOVER +| | [Documentation] | Send and receive DHCP DISCOVER. +| | ... +| | ... | *Arguments:* +| | ... | - tg_node - TG node. Type: dictionary +| | ... | - tg_interface1 - TG interface. Type: string +| | ... | - tg_interface2 - TG interface. Type: string +| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string +| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \ +| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \| +| | ... +| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} +| | ... | ${tx_src_ip} | ${tx_dst_ip} | +| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} +| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} +| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} +| | ... | --rx_if | ${tg_interface_name2} +| | ... | --tx_src_ip | ${tx_src_ip} +| | ... | --tx_dst_ip | ${tx_dst_ip} +| | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py +| | ... | ${tg_node} | ${args} + +| Send DHCP DISCOVER should fail +| | [Documentation] | Send and receive DHCP DISCOVER should fail. +| | ... +| | ... | *Arguments:* +| | ... | - tg_node - TG node. Type: dictionary +| | ... | - tg_interface1 - TG interface. Type: string +| | ... | - tg_interface2 - TG interface. Type: string +| | ... | - tx_src_ip - Source address of DHCP DISCOVER packet. Type: string +| | ... | - tx_dst_ip - Destination address of DHCP DISCOVER packet. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \ +| | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.1 \| +| | ... +| | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} +| | ... | ${tx_src_ip} | ${tx_dst_ip} | +| | ${tg_interface_name1}= | Get interface name | ${tg_node} | ${tg_interface1} +| | ${tg_interface_name2}= | Get interface name | ${tg_node} | ${tg_interface2} +| | ${args}= | Catenate | --tx_if | ${tg_interface_name1} +| | ... | --rx_if | ${tg_interface_name2} +| | ... | --tx_src_ip | ${tx_src_ip} +| | ... | --tx_dst_ip | ${tx_dst_ip} +| | Run Keyword And Expect Error | DHCP DISCOVER Rx timeout +| | ... | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py +| | ... | ${tg_node} | ${args}
\ No newline at end of file diff --git a/resources/traffic_scripts/dhcp/send_dhcp_discover.py b/resources/traffic_scripts/dhcp/send_and_check_proxy_discover.py index 1715bb1d01..d8089713fd 100755 --- a/resources/traffic_scripts/dhcp/send_dhcp_discover.py +++ b/resources/traffic_scripts/dhcp/send_and_check_proxy_discover.py @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Traffic script that sends DHCP DISCOVER packets.""" +"""Traffic script that sends DHCP DISCOVER packet + and check if is received on interface.""" import sys @@ -25,6 +26,20 @@ from resources.libraries.python.PacketVerifier import RxQueue, TxQueue from resources.libraries.python.TrafficScriptArg import TrafficScriptArg +def is_discover(pkt): + """If DHCP message type option is set to dhcp discover return True, + else return False. False is returned also if exception occurs.""" + dhcp_discover = 1 + try: + dhcp_options = pkt['BOOTP']['DHCP options'].options + message_type = filter(lambda x: x[0] == 'message-type', + dhcp_options) + message_type = message_type[0][1] + return message_type == dhcp_discover + except: + return False + + def main(): """Send DHCP DISCOVER packet.""" @@ -43,7 +58,7 @@ def main(): dhcp_discover = Ether(dst="ff:ff:ff:ff:ff:ff") / \ IP(src=tx_src_ip, dst=tx_dst_ip) / \ - UDP(sport=68, dport=67) / \ + UDP(sport=UDP_SERVICES.bootpc, dport=UDP_SERVICES.bootps) / \ BOOTP(op=1,) / \ DHCP(options=[("message-type", "discover"), "end"]) @@ -51,22 +66,12 @@ def main(): sent_packets.append(dhcp_discover) txq.send(dhcp_discover) - ether = rxq.recv(2) - - if ether is None: - raise RuntimeError('DHCP DISCOVER timeout') - - if ether[UDP].dport != UDP_SERVICES.bootps: - raise RuntimeError("UDP destination port error.") - print "UDP destination port: OK." - - if ether[UDP].sport != UDP_SERVICES.bootpc: - raise RuntimeError("UDP source port error.") - print "UDP source port: OK." - - if ether[DHCP].options[0][1] != 1: # 1 - DISCOVER message - raise RuntimeError("DHCP DISCOVER message error.") - print "DHCP DISCOVER message OK." + for _ in range(10): + dhcp_discover = rxq.recv(2) + if is_discover(dhcp_discover): + break + else: + raise RuntimeError("DHCP DISCOVER Rx timeout") sys.exit(0) diff --git a/resources/traffic_scripts/dhcp/send_dhcp_messages.py b/resources/traffic_scripts/dhcp/send_and_check_proxy_messages.py index 7881c24afd..27f148c900 100755 --- a/resources/traffic_scripts/dhcp/send_dhcp_messages.py +++ b/resources/traffic_scripts/dhcp/send_and_check_proxy_messages.py @@ -25,27 +25,18 @@ from resources.libraries.python.PacketVerifier import RxQueue, TxQueue from resources.libraries.python.TrafficScriptArg import TrafficScriptArg -def dhcp_discover(args): - """Send DHCP DISCOVER packet.""" - - tx_if = args.get_arg('tx_if') - rx_if = args.get_arg('rx_if') +def dhcp_discover(tx_if, rx_if, tx_src_ip, tx_dst_ip, server_ip, proxy_ip, + client_mac): + """Send and check DHCP DISCOVER proxy packet.""" rxq = RxQueue(rx_if) txq = TxQueue(tx_if) - tx_src_ip = "0.0.0.0" - tx_dst_ip = "255.255.255.255" - - server_ip = args.get_arg('server_ip') - proxy_ip = args.get_arg('proxy_ip') - client_mac = args.get_arg('client_mac') - sent_packets = [] dhcp_discover = Ether(src=client_mac, dst="ff:ff:ff:ff:ff:ff") / \ IP(src=tx_src_ip, dst=tx_dst_ip) / \ - UDP(sport=68, dport=67) / \ + UDP(sport=UDP_SERVICES.bootpc, dport=UDP_SERVICES.bootps) / \ BOOTP(op=1,) / \ DHCP(options=[("message-type", "discover"), "end"]) @@ -81,29 +72,22 @@ def dhcp_discover(args): if ether[DHCP].options[0][1] != 1: # 1 - DISCOVER message raise RuntimeError("DHCP DISCOVER message error.") print "DHCP DISCOVER message OK." - dhcp_offer(args, option_82) + return option_82 -def dhcp_offer(args, option_82): - """Send DHCP OFFER packet.""" - rx_if = args.get_arg('tx_if') - tx_if = args.get_arg('rx_if') +def dhcp_offer(rx_if, tx_if, tx_dst_ip, server_ip, proxy_ip, client_ip, + server_mac, option_82): + """Send and check DHCP OFFER proxy packet.""" rxq = RxQueue(rx_if) txq = TxQueue(tx_if) - tx_dst_ip = "255.255.255.255" - server_ip = args.get_arg('server_ip') - server_mac = args.get_arg('server_mac') - client_ip = args.get_arg('client_ip') - proxy_ip = args.get_arg('proxy_ip') - sent_packets = [] dhcp_offer = Ether(src=server_mac, dst="ff:ff:ff:ff:ff:ff") / \ IP(src=server_ip, dst=tx_dst_ip) / \ - UDP(sport=67, dport=68) / \ + UDP(sport=UDP_SERVICES.bootps, dport=UDP_SERVICES.bootpc) / \ BOOTP(op=2, yiaddr=client_ip, siaddr=server_ip) / \ @@ -148,29 +132,20 @@ def dhcp_offer(args, option_82): if ether[DHCP].options[0][1] != 2: # 2 - OFFER message raise RuntimeError("DHCP OFFER message error.") print "DHCP OFFER message OK." - dhcp_request(args) -def dhcp_request(args): - """Send DHCP REQUEST packet.""" - - tx_if = args.get_arg('tx_if') - rx_if = args.get_arg('rx_if') +def dhcp_request(tx_if, rx_if, tx_src_ip, tx_dst_ip, server_ip, proxy_ip, + client_ip, client_mac): + """Send and check DHCP REQUEST proxy packet.""" rxq = RxQueue(rx_if) txq = TxQueue(tx_if) - tx_dst_ip = "255.255.255.255" - server_ip = args.get_arg('server_ip') - client_ip = args.get_arg('client_ip') - client_mac = args.get_arg('client_mac') - proxy_ip = args.get_arg('proxy_ip') - sent_packets = [] dhcp_request = Ether(src=client_mac, dst="ff:ff:ff:ff:ff:ff") / \ - IP(src="0.0.0.0", dst=tx_dst_ip) / \ - UDP(sport=68, dport=67) / \ + IP(src=tx_src_ip, dst=tx_dst_ip) / \ + UDP(sport=UDP_SERVICES.bootpc, dport=UDP_SERVICES.bootps) / \ BOOTP(op=1, giaddr=proxy_ip, siaddr=server_ip) / \ @@ -213,35 +188,26 @@ def dhcp_request(args): if ether[DHCP].options[3][0] != 'relay_agent_Information': # option 82 raise RuntimeError("Relay agent information error.") - option_82 = ether[DHCP].options[3][1] if ether[DHCP].options[0][1] != 3: # 2 - REQUEST message raise RuntimeError("DHCP REQUEST message error.") print "DHCP REQUEST message: OK." - dhcp_ack(args, option_82) - -def dhcp_ack(args, option_82): - """Send DHCP ACK packet.""" - rx_if = args.get_arg('tx_if') - tx_if = args.get_arg('rx_if') +def dhcp_ack(rx_if, tx_if, tx_dst_ip, server_ip, proxy_ip, client_ip, + server_mac, option_82): + """Send and check DHCP ACK proxy packet.""" rxq = RxQueue(rx_if) txq = TxQueue(tx_if) - tx_dst_ip = "255.255.255.255" - server_ip = args.get_arg('server_ip') - server_mac = args.get_arg('server_mac') - client_ip = args.get_arg('client_ip') - proxy_ip = args.get_arg('proxy_ip') lease_time = 43200 # 12 hours sent_packets = [] dhcp_ack = Ether(src=server_mac, dst="ff:ff:ff:ff:ff:ff") / \ IP(src=server_ip, dst=tx_dst_ip) / \ - UDP(sport=67, dport=68) / \ + UDP(sport=UDP_SERVICES.bootps, dport=UDP_SERVICES.bootpc) / \ BOOTP(op=2, yiaddr=client_ip, siaddr=server_ip) / \ @@ -294,12 +260,38 @@ def dhcp_ack(args, option_82): def main(): - """Send DHCP messages.""" + """Send DHCP proxy messages.""" args = TrafficScriptArg(['server_ip', 'server_mac', 'client_ip', 'client_mac', 'proxy_ip']) - dhcp_discover(args) + tx_if = args.get_arg('tx_if') + rx_if = args.get_arg('rx_if') + + tx_src_ip = "0.0.0.0" + tx_dst_ip = "255.255.255.255" + + server_ip = args.get_arg('server_ip') + client_ip = args.get_arg('client_ip') + proxy_ip = args.get_arg('proxy_ip') + client_mac = args.get_arg('client_mac') + server_mac = args.get_arg('server_mac') + + # DHCP DISCOVER + option_82 = dhcp_discover(tx_if, rx_if, tx_src_ip, tx_dst_ip, server_ip, + proxy_ip, client_mac) + + # DHCP OFFER + dhcp_offer(tx_if, rx_if, tx_dst_ip, server_ip, proxy_ip, client_ip, + server_mac, option_82) + + # DHCP REQUEST + dhcp_request(tx_if, rx_if, tx_src_ip, tx_dst_ip, server_ip, proxy_ip, + client_ip, client_mac) + + # DHCP ACK + dhcp_ack(tx_if, rx_if, tx_dst_ip, server_ip, proxy_ip, client_ip, + server_mac, option_82) sys.exit(0) |