X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2Fsend_icmp_wait_for_reply.py;h=f09287f24e7cc542ec21de9c513c0bcf33e4a33c;hp=ea82a81f4ba32341052910e1c52081caab852289;hb=70766243f6c00c77fedc00d68114c108528950d6;hpb=39c7d3bca8c47bb7bb5ccbaf86ac206786caefb4 diff --git a/GPL/traffic_scripts/send_icmp_wait_for_reply.py b/GPL/traffic_scripts/send_icmp_wait_for_reply.py index ea82a81f4b..f09287f24e 100644 --- a/GPL/traffic_scripts/send_icmp_wait_for_reply.py +++ b/GPL/traffic_scripts/send_icmp_wait_for_reply.py @@ -26,7 +26,6 @@ """Traffic script that sends an IP ICMPv4 or ICMPv6.""" import sys -import ipaddress from scapy.layers.inet import ICMP, IP from scapy.layers.inet6 import ICMPv6EchoRequest, ICMPv6EchoReply,\ @@ -36,36 +35,7 @@ from scapy.packet import Raw from .PacketVerifier import RxQueue, TxQueue from .TrafficScriptArg import TrafficScriptArg - - -def valid_ipv4(ip_address): - """Check IPv4 address. - - :param ip_address: IPv4 address to check. - :type ip_address: str - :returns: True if IP address is correct. - :rtype: bool - """ - try: - ipaddress.IPv4Address(ip_address) - return True - except (AttributeError, ipaddress.AddressValueError): - return False - - -def valid_ipv6(ip_address): - """Check IPv6 address. - - :param ip_address: IPv6 address to check. - :type ip_address: str - :returns: True if IP address is correct. - :rtype: bool - """ - try: - ipaddress.IPv6Address(ip_address) - return True - except (AttributeError, ipaddress.AddressValueError): - return False +from .ValidIp import valid_ipv4, valid_ipv6 def main():