aboutsummaryrefslogtreecommitdiffstats
path: root/GPL/traffic_scripts/lisp
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2021-06-17 14:03:43 +0200
committerVratko Polak <vrpolak@cisco.com>2021-06-17 14:03:43 +0200
commit70766243f6c00c77fedc00d68114c108528950d6 (patch)
treef2a79a4c98c37bd68a1b32851120d97c8e2462a7 /GPL/traffic_scripts/lisp
parent39c7d3bca8c47bb7bb5ccbaf86ac206786caefb4 (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/lisp')
-rw-r--r--GPL/traffic_scripts/lisp/lisp_check.py32
-rw-r--r--GPL/traffic_scripts/lisp/lispgpe_check.py32
2 files changed, 2 insertions, 62 deletions
diff --git a/GPL/traffic_scripts/lisp/lisp_check.py b/GPL/traffic_scripts/lisp/lisp_check.py
index bfe8990e1c..35377b0eb6 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.
diff --git a/GPL/traffic_scripts/lisp/lispgpe_check.py b/GPL/traffic_scripts/lisp/lispgpe_check.py
index 85c85885f6..74740378ea 100644
--- a/GPL/traffic_scripts/lisp/lispgpe_check.py
+++ b/GPL/traffic_scripts/lisp/lispgpe_check.py
@@ -29,7 +29,6 @@ packet.
"""
import sys
-import ipaddress
from scapy.all import bind_layers, Packet
from scapy.fields import FlagsField, BitField, XBitField, IntField
@@ -41,6 +40,7 @@ from scapy.packet import Raw
from ..PacketVerifier import RxQueue, TxQueue
from ..TrafficScriptArg import TrafficScriptArg
+from ..ValidIp import valid_ipv4, valid_ipv6
class LispGPEHeader(Packet):
@@ -92,36 +92,6 @@ class LispGPEInnerNSH(Packet):
"""
-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.