lib/ip: Add wrapper for netaddr.valid_ipv4/6

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 40 insertions, 0 deletions

diff --git a/ryu/lib/ip.py b/ryu/lib/ip.py
index 4db69cc2..c4094b9a 100644
--- a/ryu/lib/ip.py
+++ b/ryu/lib/ip.py
@@ -16,10 +16,50 @@
 import numbers
 import struct
 
+import netaddr
+
 from ryu.lib import addrconv
 from ryu.lib import type_desc
 
 
+def _valid_ip(strategy, bits, addr, flags=0):
+    addr = addr.split('/')
+    if len(addr) == 1:
+        return strategy(addr[0], flags)
+    elif len(addr) == 2:
+        return strategy(addr[0], flags) and 0 <= int(addr[1]) <= bits
+    else:
+        return False
+
+
+def valid_ipv4(addr, flags=0):
+    """
+    Wrapper function of "netaddr.valid_ipv4()".
+
+    The function extends "netaddr.valid_ipv4()" to enable to validate
+    IPv4 network address in "xxx.xxx.xxx.xxx/xx" format.
+
+    :param addr: IP address to be validated.
+    :param flags: See the "netaddr.valid_ipv4()" docs for details.
+    :return: True is valid. False otherwise.
+    """
+    return _valid_ip(netaddr.valid_ipv4, 32, addr, flags)
+
+
+def valid_ipv6(addr, flags=0):
+    """
+    Wrapper function of "netaddr.valid_ipv6()".
+
+    The function extends "netaddr.valid_ipv6()" to enable to validate
+    IPv4 network address in "xxxx:xxxx:xxxx::/xx" format.
+
+    :param addr: IP address to be validated.
+    :param flags: See the "netaddr.valid_ipv6()" docs for details.
+    :return: True is valid. False otherwise.
+    """
+    return _valid_ip(netaddr.valid_ipv6, 128, addr, flags)
+
+
 def ipv4_to_bin(ip):
     """
     Converts human readable IPv4 string to binary representation.