diff options
author | 2021-06-17 14:03:43 +0200 | |
---|---|---|
committer | 2021-06-17 14:03:43 +0200 | |
commit | 70766243f6c00c77fedc00d68114c108528950d6 (patch) | |
tree | f2a79a4c98c37bd68a1b32851120d97c8e2462a7 /GPL/traffic_scripts/send_icmp_wait_for_reply.py | |
parent | 39c7d3bca8c47bb7bb5ccbaf86ac206786caefb4 (diff) |
Traffic scripts: Move valid_ipv* to a library
No need to implement the same two functions in 5 places.
Change-Id: I7bbcfaba18030a0520aaef5dcf06ed155bcf806b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'GPL/traffic_scripts/send_icmp_wait_for_reply.py')
-rw-r--r-- | GPL/traffic_scripts/send_icmp_wait_for_reply.py | 32 |
1 files changed, 1 insertions, 31 deletions
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(): |