X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftraffic_scripts%2Fipfix_check.py;h=2a08f0ce858ec2df50d36029835eedcc22acecc5;hp=14b5a074dba7becf46a4d69ed1d97b34be2b9937;hb=6721e7f09aa95bff6622068332a3f56afad9c87b;hpb=f2711a847cd8de8dadce1049747e78f96bcae031 diff --git a/resources/traffic_scripts/ipfix_check.py b/resources/traffic_scripts/ipfix_check.py index 14b5a074db..2a08f0ce85 100755 --- a/resources/traffic_scripts/ipfix_check.py +++ b/resources/traffic_scripts/ipfix_check.py @@ -16,15 +16,16 @@ """Traffic script - IPFIX listener.""" import sys -from ipaddress import IPv4Address, IPv6Address, AddressValueError +from ipaddress import IPv4Address, IPv6Address, AddressValueError from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6 from scapy.layers.l2 import Ether -from resources.libraries.python.IPFIXUtil import IPFIXHandler, IPFIXData from resources.libraries.python.PacketVerifier import RxQueue, TxQueue, auto_pad from resources.libraries.python.TrafficScriptArg import TrafficScriptArg +from resources.libraries.python.telemetry.IPFIXUtil import IPFIXHandler, \ + IPFIXData def valid_ipv4(ip): @@ -81,7 +82,6 @@ def main(): rxq = RxQueue(tx_if) # generate simple packet based on arguments - 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): @@ -117,17 +117,10 @@ def main(): # allow scapy to recognize IPFIX headers and templates ipfix = IPFIXHandler() - - # clear receive buffer - while True: - pkt = rxq.recv(1, ignore=ignore, verbose=verbose) - if pkt is None: - break - data = None # get IPFIX template and data while True: - pkt = rxq.recv(5) + pkt = rxq.recv(10, ignore=ignore, verbose=verbose) if pkt is None: raise RuntimeError("RX timeout") if pkt.haslayer("IPFIXHeader"): @@ -194,5 +187,4 @@ def main(): if __name__ == "__main__": - main()