diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/robot/traffic.robot | 8 | ||||
| -rwxr-xr-x | resources/traffic_scripts/send_icmp_check_arp.py | 43 |
2 files changed, 34 insertions, 17 deletions
diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/traffic.robot index eb7dd7c6e1..29635c0a34 100644 --- a/resources/libraries/robot/traffic.robot +++ b/resources/libraries/robot/traffic.robot @@ -107,7 +107,7 @@ | | ... | ${tg_node} | ${args} | Send Packet And Check ARP Request -| | [Documentation] | Send IP packet from tx_port and check if ARP Request +| | [Documentation] | Send IP packet from tx_port and check if ARP Request\ | | ... | packet is received on rx_port. | | ... | | ... | *Arguments:* @@ -139,13 +139,13 @@ | | ... | | ... | \| Send Packet And Check ARP Packet \| ${nodes['TG']} \| 16.0.0.1 \ | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \ -| | ... | \| eth4 \| 08:00:27:5b:49:dd \| 08:00:27:54:71:02 \| +| | ... | \| eth4 \| 08:00:27:5b:49:dd \| 192.168.2.1 \| 192.168.2.2 \| | | ... | | [Arguments] | ${tg_node} | ${tx_src_ip} | ${tx_dst_ip} | ${tx_port} -| | ... | ${tx_dst_mac} | ${rx_port} | ${rx_dst_mac} | ${rx_arp_src_ip} +| | ... | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac} | ${rx_arp_src_ip} | | ... | ${rx_arp_dst_ip} | | ${args}= | Catenate -| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac} +| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_src_mac | ${rx_src_mac} | | ... | --tx_src_ip | ${tx_src_ip} | --tx_dst_ip | ${tx_dst_ip} | | ... | --tx_if | ${tx_port} | --rx_if | ${rx_port} | | ... | --rx_arp_src_ip ${rx_arp_src_ip} | --rx_arp_dst_ip ${rx_arp_dst_ip} diff --git a/resources/traffic_scripts/send_icmp_check_arp.py b/resources/traffic_scripts/send_icmp_check_arp.py index 4a3c442114..49d4710ba4 100755 --- a/resources/traffic_scripts/send_icmp_check_arp.py +++ b/resources/traffic_scripts/send_icmp_check_arp.py @@ -46,15 +46,16 @@ def main(): """Send IP ICMP packet from one traffic generator interface and expects ARP on the other.""" args = TrafficScriptArg( - ['tx_dst_mac', 'rx_dst_mac', 'tx_src_ip', 'tx_dst_ip', 'rx_arp_src_ip', + ['tx_dst_mac', 'rx_src_mac', 'tx_src_ip', 'tx_dst_ip', 'rx_arp_src_ip', 'rx_arp_dst_ip']) tx_dst_mac = args.get_arg('tx_dst_mac') - rx_dst_mac = args.get_arg('rx_dst_mac') + rx_src_mac = args.get_arg('rx_src_mac') src_ip = args.get_arg('tx_src_ip') dst_ip = args.get_arg('tx_dst_ip') tx_if = args.get_arg('tx_if') rx_if = args.get_arg('rx_if') + rx_dst_mac = 'ff:ff:ff:ff:ff:ff' rx_arp_src_ip = args.get_arg('rx_arp_src_ip') rx_arp_dst_ip = args.get_arg('rx_arp_dst_ip') @@ -73,6 +74,20 @@ def main(): if ether is None: raise RuntimeError("Ethernet frame Rx timeout") + if ether.dst == rx_dst_mac: + print("Ethernet destination address matched.") + else: + raise RuntimeError( + "Matching ethernet destination address unsuccessful: {0} != {1}". + format(ether.dst, rx_dst_mac)) + + if ether.src == rx_src_mac: + print("Ethernet source address matched.") + else: + raise RuntimeError( + "Matching ethernet source address unsuccessful: {0} != {1}" + .format(ether.src, rx_src_mac)) + # ARP check if ether['ARP'] is not None: print("ARP packet received.") @@ -84,32 +99,34 @@ def main(): if ether['ARP'].op == 1: # 1 - who-has request print("ARP request matched.") else: - raise RuntimeError("Matching ARP request unsuccessful: {0}" - .format(ether.__repr__())) + raise RuntimeError("Matching ARP request unsuccessful: {0} != {1}" + .format(ether['ARP'].op, 1)) - if ether['ARP'].hwsrc == rx_dst_mac: + if ether['ARP'].hwsrc == rx_src_mac: print("Source MAC matched.") else: - raise RuntimeError("Matching Source MAC unsuccessful: {0}" - .format(ether.__repr__())) + raise RuntimeError("Matching Source MAC unsuccessful: {0} != {1}" + .format(ether['ARP'].hwsrc, rx_src_mac)) if ether['ARP'].hwdst == "00:00:00:00:00:00": print("Destination MAC matched.") else: - raise RuntimeError("Matching Destination MAC unsuccessful: {0}" - .format(ether.__repr__())) + raise RuntimeError("Matching Destination MAC unsuccessful: {0} != {1}" + .format(ether['ARP'].hwdst, "00:00:00:00:00:00")) if ether['ARP'].psrc == rx_arp_src_ip: print("Source ARP IP address matched.") else: - raise RuntimeError("Matching Source ARP IP address unsuccessful: {0}" - .format(ether.__repr__())) + raise RuntimeError( + "Matching Source ARP IP address unsuccessful: {0} != {1}" + .format(ether['ARP'].psrc, rx_arp_src_ip)) if ether['ARP'].pdst == rx_arp_dst_ip: print("Destination ARP IP address matched.") else: - raise RuntimeError("Matching Destination ARP IP address unsuccessful: " - "{0}".format(ether.__repr__())) + raise RuntimeError( + "Matching Destination ARP IP address unsuccessful: {0} != {1}" + .format(ether['ARP'].pdst, rx_arp_dst_ip)) sys.exit(0) |