X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2Fnat.py;h=3722d6b8db3f31b909232532c2df6fa818a30b08;hb=fe9072ce82a91c5d6de30d07756d5a12b80f9c74;hp=994157ae81141d0fa7ab23edbf6a414811958bed;hpb=b67b82c15d7d0da402df180b0aaab3daa4cfc76c;p=csit.git diff --git a/GPL/traffic_scripts/nat.py b/GPL/traffic_scripts/nat.py index 994157ae81..3722d6b8db 100644 --- a/GPL/traffic_scripts/nat.py +++ b/GPL/traffic_scripts/nat.py @@ -27,8 +27,6 @@ import sys -import ipaddress - from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA from scapy.layers.l2 import Ether @@ -36,38 +34,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 - :raises AttributeError, AddressValueError: If IP address is not valid. - """ - 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 - :raises AttributeError, AddressValueError: If IP address is not valid. - """ - try: - ipaddress.IPv6Address(ip_address) - return True - except (AttributeError, ipaddress.AddressValueError): - return False +from .ValidIp import valid_ipv4, valid_ipv6 def main():