X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2Flisp%2Flisp_check.py;h=6a5e85c869957658fe3c20278e65112022668573;hp=bfe8990e1cd79d3966df67667c81954afada85f8;hb=bd15bb418bf618ff3055fb25c339778d12c1eaef;hpb=9d14c2d71ce85fe95aa9a2321738abb25d032b0c diff --git a/GPL/traffic_scripts/lisp/lisp_check.py b/GPL/traffic_scripts/lisp/lisp_check.py index bfe8990e1c..6a5e85c869 100644 --- a/GPL/traffic_scripts/lisp/lisp_check.py +++ b/GPL/traffic_scripts/lisp/lisp_check.py @@ -28,7 +28,6 @@ a LISP-encapsulated packet on the other interface and verifies received packet. """ import sys -import ipaddress from scapy.all import bind_layers, Packet from scapy.fields import FlagsField, BitField, IntField @@ -40,6 +39,7 @@ from scapy.packet import Raw from ..PacketVerifier import RxQueue, TxQueue from ..TrafficScriptArg import TrafficScriptArg +from ..ValidIp import valid_ipv4, valid_ipv6 class LispHeader(Packet): @@ -66,36 +66,6 @@ class LispInnerIPv6(IPv6): name = u"Lisp Inner Layer - IPv6" -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 - - def main(): """Send IP ICMP packet from one traffic generator interface to the other. @@ -186,7 +156,7 @@ def main(): if not isinstance(ip, IPv6): raise RuntimeError(f"Not an IP packet received {ip!r}") elif not isinstance(ip, ip_format): - raise RuntimeError(f"Not an IP packet received {ip!r}") + raise RuntimeError(f"Not an IP packet received {ip!r}") lisp = ether.getlayer(lisp_layer) if not lisp: