aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/robot/traffic.robot26
-rwxr-xr-xresources/traffic_scripts/send_icmp_check_headers.py104
2 files changed, 97 insertions, 33 deletions
diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/traffic.robot
index f21831fe5a..18db071e01 100644
--- a/resources/libraries/robot/traffic.robot
+++ b/resources/libraries/robot/traffic.robot
@@ -46,6 +46,16 @@
| | ... | - rx_port - Interface of TG-if1. Type: string
| | ... | - rx_src_mac - MAC address of DUT1-if2. Type: string
| | ... | - rx_dst_mac - MAC address of TG-if2. Type: string
+| | ... | - encaps_tx - Expected encapsulation on TX side: Dot1q or Dot1ad
+| | ... | (Optional). Type: string
+| | ... | - vlan_tx - VLAN (inner) tag on TX side (Optional). Type: integer
+| | ... | - vlan_outer_tx - .1AD VLAN (outer) tag on TX side (Optional).
+| | ... | Type: integer
+| | ... | - encaps_rx - Expected encapsulation on RX side: Dot1q or Dot1ad
+| | ... | (Optional). Type: string
+| | ... | - vlan_rx - VLAN (inner) tag on RX side (Optional). Type: integer
+| | ... | - vlan_outer_rx - .1AD VLAN (outer) tag on RX side (Optional).
+| | ... | Type: integer
| | ...
| | ... | *Return:*
| | ... | - No value returned
@@ -59,12 +69,28 @@
| | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port} |
| | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac}
| | ... | ${rx_dst_mac}
+| | ... | ${encaps_tx}=${EMPTY} | ${vlan_tx}=${EMPTY} | ${vlan_outer_tx}=${EMPTY}
+| | ... | ${encaps_rx}=${EMPTY} | ${vlan_rx}=${EMPTY} | ${vlan_outer_rx}=${EMPTY}
| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port}
| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
| | ${args}= | Catenate | --tg_src_mac | ${tx_src_mac} | --tg_dst_mac |
| | ... | ${rx_dst_mac} | --dut_if1_mac | ${tx_dst_mac} | --dut_if2_mac |
| | ... | ${rx_src_mac} | --src_ip | ${src_ip} | --dst_ip | ${dst_ip} |
| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name}
+| | ${args}= | Run Keyword If | '${encaps_tx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate
+| | ... | ${args} | --encaps_tx ${encaps_tx} | --vlan_tx ${vlan_tx}
+| | ${args}= | Run Keyword If | '${encaps_rx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate
+| | ... | ${args} | --encaps_rx ${encaps_rx} | --vlan_rx ${vlan_rx}
+| | ${args}= | Run Keyword If | '${vlan_outer_tx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --vlan_outer_tx ${vlan_outer_tx}
+| | ${args}= | Run Keyword If | '${vlan_outer_rx}' == '${EMPTY}'
+| | | ... | Set Variable | ${args}
+| | ... | ELSE | Catenate | ${args} | --vlan_outer_rx ${vlan_outer_rx}
| | Run Traffic Script On Node | send_icmp_check_headers.py | ${tg_node} |
| | ... | ${args}
diff --git a/resources/traffic_scripts/send_icmp_check_headers.py b/resources/traffic_scripts/send_icmp_check_headers.py
index 7450bd18e3..c9e3a35df4 100755
--- a/resources/traffic_scripts/send_icmp_check_headers.py
+++ b/resources/traffic_scripts/send_icmp_check_headers.py
@@ -18,13 +18,13 @@ MAC addresses are checked in received packet.
"""
import sys
-import ipaddress
+import ipaddress
+from robot.api import logger
from scapy.layers.inet import ICMP, IP
-from scapy.layers.inet6 import IPv6
-from scapy.all import Ether
from scapy.layers.inet6 import ICMPv6EchoRequest
-from robot.api import logger
+from scapy.layers.inet6 import IPv6
+from scapy.layers.l2 import Ether, Dot1Q
from resources.libraries.python.PacketVerifier import RxQueue, TxQueue
from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
@@ -50,57 +50,95 @@ def main():
"""Send IP ICMP packet from one traffic generator interface to the other."""
args = TrafficScriptArg(
['tg_src_mac', 'tg_dst_mac', 'src_ip', 'dst_ip', 'dut_if1_mac',
- 'dut_if2_mac'])
-
- src_mac = args.get_arg('tg_src_mac')
- dst_mac = args.get_arg('tg_dst_mac')
- dut1_if1_mac = args.get_arg('dut_if1_mac')
- dut1_if2_mac = args.get_arg('dut_if2_mac')
+ 'dut_if2_mac'],
+ ['encaps_tx', 'vlan_tx', 'vlan_outer_tx',
+ 'encaps_rx', 'vlan_rx', 'vlan_outer_rx'])
+
+ tx_src_mac = args.get_arg('tg_src_mac')
+ tx_dst_mac = args.get_arg('dut_if1_mac')
+ rx_dst_mac = args.get_arg('tg_dst_mac')
+ rx_src_mac = args.get_arg('dut_if2_mac')
src_ip = args.get_arg('src_ip')
dst_ip = args.get_arg('dst_ip')
tx_if = args.get_arg('tx_if')
rx_if = args.get_arg('rx_if')
+ encaps_tx = args.get_arg('encaps_tx')
+ vlan_tx = args.get_arg('vlan_tx')
+ vlan_outer_tx = args.get_arg('vlan_outer_tx')
+ encaps_rx = args.get_arg('encaps_rx')
+ vlan_rx = args.get_arg('vlan_rx')
+ vlan_outer_rx = args.get_arg('vlan_outer_rx')
+
rxq = RxQueue(rx_if)
txq = TxQueue(tx_if)
sent_packets = []
ip_format = ''
- pkt_raw = ''
+ pkt_raw = Ether(src=tx_src_mac, dst=tx_dst_mac)
+ if encaps_tx == 'Dot1q':
+ pkt_raw /= Dot1Q(vlan=int(vlan_tx))
+ elif encaps_tx == 'Dot1ad':
+ pkt_raw.type = 0x88a8
+ pkt_raw /= Dot1Q(vlan=vlan_outer_tx)
+ pkt_raw /= Dot1Q(vlan=vlan_tx)
if valid_ipv4(src_ip) and valid_ipv4(dst_ip):
- pkt_raw = (Ether(src=src_mac, dst=dut1_if1_mac) /
- IP(src=src_ip, dst=dst_ip) /
- ICMP())
- ip_format = 'IP'
+ pkt_raw /= IP(src=src_ip, dst=dst_ip)
+ pkt_raw /= ICMP()
+ ip_format = IP
elif valid_ipv6(src_ip) and valid_ipv6(dst_ip):
- pkt_raw = (Ether(src=src_mac, dst=dut1_if1_mac) /
- IPv6(src=src_ip, dst=dst_ip) /
- ICMPv6EchoRequest())
- ip_format = 'IPv6'
+ pkt_raw /= IPv6(src=src_ip, dst=dst_ip)
+ pkt_raw /= ICMPv6EchoRequest()
+ ip_format = IPv6
else:
raise ValueError("IP not in correct format")
sent_packets.append(pkt_raw)
txq.send(pkt_raw)
- ether = rxq.recv(2)
+ if tx_if == rx_if:
+ ether = rxq.recv(2, ignore=sent_packets)
+ else:
+ ether = rxq.recv(2)
if ether is None:
raise RuntimeError("ICMP echo Rx timeout")
- if not ether.haslayer(ip_format):
- raise RuntimeError("Not an IP packet received {0}"
- .format(ether.__repr__()))
- # Compare data from packets
- if src_ip == ether[ip_format].src and dst_ip == ether[ip_format].dst:
- logger.trace("IP matched")
- if dst_mac == ether['Ethernet'].dst and \
- dut1_if2_mac == ether['Ethernet'].src:
- logger.trace("MAC matched")
+ if rx_dst_mac == ether[Ether].dst and rx_src_mac == ether[Ether].src:
+ logger.trace("MAC matched")
+ else:
+ raise RuntimeError(
+ "Matching packet unsuccessful: {0}".format(ether.__repr__()))
+
+ if encaps_rx == 'Dot1q':
+ if ether[Dot1Q].vlan == int(vlan_rx):
+ logger.trace("VLAN matched")
else:
- raise RuntimeError("Matching packet unsuccessful: {0}"
- .format(ether.__repr__()))
+ raise RuntimeError('Ethernet frame with wrong VLAN tag ({}-'
+ 'received, {}-expected):\n{}'
+ .format(ether[Dot1Q].vlan, vlan_rx,
+ ether.__repr__()))
+ ip = ether[Dot1Q].payload
+ elif encaps_rx == 'Dot1ad':
+ raise NotImplementedError()
else:
- raise RuntimeError("Matching packet unsuccessful: {0}"
- .format(ether.__repr__()))
+ ip = ether.payload
+
+ if not isinstance(ip, ip_format):
+ raise RuntimeError(
+ "Not an IP packet received {0}".format(ip.__repr__()))
+
+ # Compare data from packets
+ if src_ip == ip.src:
+ logger.trace("Src IP matched")
+ else:
+ raise RuntimeError("Matching Src IP unsuccessful: {} != {}"
+ .format(src_ip, ip.src))
+
+ if dst_ip == ip.dst:
+ logger.trace("Dst IP matched")
+ else:
+ raise RuntimeError("Matching Dst IP unsuccessful: {} != {}"
+ .format(dst_ip, ip.dst))
+
sys.exit(0)