Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Trending dashboard
[csit.git]
/
resources
/
traffic_scripts
/
send_tcp_for_classifier_test.py
diff --git
a/resources/traffic_scripts/send_tcp_for_classifier_test.py
b/resources/traffic_scripts/send_tcp_for_classifier_test.py
index
f08816e
..
5a6873a
100755
(executable)
--- a/
resources/traffic_scripts/send_tcp_for_classifier_test.py
+++ b/
resources/traffic_scripts/send_tcp_for_classifier_test.py
@@
-17,27
+17,24
@@
Traffic script that sends an TCP packet
from TG to DUT.
"""
import sys
from TG to DUT.
"""
import sys
-import time
-from scapy.layers.inet import IP, UDP, TCP
-from scapy.layers.inet6 import IPv6
from scapy.all import Ether, Packet, Raw
from scapy.all import Ether, Packet, Raw
-from scapy.all import sendp
+from scapy.layers.inet import IP, TCP
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS
from resources.libraries.python.SFC.VerifyPacket import *
from resources.libraries.python.SFC.VerifyPacket import *
-from resources.libraries.python.SFC.SFCConstants import SFCConstants as
sfcc
on
+from resources.libraries.python.SFC.SFCConstants import SFCConstants as
SfcC
on
from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
+from resources.libraries.python.PacketVerifier import RxQueue, TxQueue
-from robot.api import logger
def main():
"""Send TCP packet from one traffic generator interface to DUT.
:raises: If the IP address is invalid.
"""
def main():
"""Send TCP packet from one traffic generator interface to DUT.
:raises: If the IP address is invalid.
"""
- args = TrafficScriptArg(
- ['src_mac', 'dst_mac', 'src_ip', 'dst_ip',
- 'timeout', 'framesize', 'testtype'])
+ args = TrafficScriptArg(['src_mac', 'dst_mac', 'src_ip', 'dst_ip',
+ 'timeout', 'framesize', 'testtype'])
src_mac = args.get_arg('src_mac')
dst_mac = args.get_arg('dst_mac')
src_mac = args.get_arg('src_mac')
dst_mac = args.get_arg('dst_mac')
@@
-49,11
+46,14
@@
def main():
frame_size = int(args.get_arg('framesize'))
test_type = args.get_arg('testtype')
frame_size = int(args.get_arg('framesize'))
test_type = args.get_arg('testtype')
+ rxq = RxQueue(rx_if)
+ txq = TxQueue(tx_if)
+ sent_packets = []
+
protocol = TCP
protocol = TCP
- source_port =
sfcc
on.DEF_SRC_PORT
- destination_port =
sfcc
on.DEF_DST_PORT
+ source_port =
SfcC
on.DEF_SRC_PORT
+ destination_port =
SfcC
on.DEF_DST_PORT
- ip_version = None
if valid_ipv4(src_ip) and valid_ipv4(dst_ip):
ip_version = IP
elif valid_ipv6(src_ip) and valid_ipv6(dst_ip):
if valid_ipv4(src_ip) and valid_ipv4(dst_ip):
ip_version = IP
elif valid_ipv6(src_ip) and valid_ipv6(dst_ip):
@@
-62,8
+62,8
@@
def main():
raise ValueError("Invalid IP version!")
pkt_header = (Ether(src=src_mac, dst=dst_mac) /
raise ValueError("Invalid IP version!")
pkt_header = (Ether(src=src_mac, dst=dst_mac) /
- ip_version(src=src_ip, dst=dst_ip) /
- protocol(sport=int(source_port), dport=int(destination_port)))
+
ip_version(src=src_ip, dst=dst_ip) /
+
protocol(sport=int(source_port), dport=int(destination_port)))
fsize_no_fcs = frame_size - 4
pad_len = max(0, fsize_no_fcs - len(pkt_header))
fsize_no_fcs = frame_size - 4
pad_len = max(0, fsize_no_fcs - len(pkt_header))
@@
-71,12
+71,24
@@
def main():
pkt_raw = pkt_header / Raw(load=pad_data)
pkt_raw = pkt_header / Raw(load=pad_data)
- sendp(pkt_raw, iface=tx_if, count=3)
+ # Send created packet on one interface and receive on the other
+ sent_packets.append(pkt_raw)
+ txq.send(pkt_raw)
+
+ while True:
+ ether = rxq.recv(timeout)
+ if ether is None:
+ raise RuntimeError('No packet is received!')
- time.sleep(timeout)
+ if ether.haslayer(ICMPv6ND_NS):
+ # read another packet in the queue if the current one is ICMPv6ND_NS
+ continue
+ else:
+ # otherwise process the current packet
+ break
# let us begin to check the NSH SFC loopback packet
# let us begin to check the NSH SFC loopback packet
- VerifyPacket.check_the_nsh_sfc_packet(frame_size, test_type)
+ VerifyPacket.check_the_nsh_sfc_packet(
ether,
frame_size, test_type)
# we check all the fields about the loopback packet, this test will pass
sys.exit(0)
# we check all the fields about the loopback packet, this test will pass
sys.exit(0)