From dba564e2873b37a3da9b109cc5741414ca41fa69 Mon Sep 17 00:00:00 2001 From: Can Zhang Date: Tue, 16 Apr 2013 08:42:32 +0800 Subject: [PATCH 3/4] method name changes to conform with ryu convention Signed-off-by: Can Zhang --- ryu/lib/ip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ryu/lib/ip.py b/ryu/lib/ip.py index 8e774d9..3d2e822 100644 --- a/ryu/lib/ip.py +++ b/ryu/lib/ip.py @@ -1,7 +1,7 @@ import struct -def ipNum(w, x, y, z): +def ipv4_arg_to_bin(w, x, y, z): """Generate unsigned int from components of IP address returns: w << 24 | x << 16 | y << 8 | z""" return (w << 24) | (x << 16) | (y << 8) | z @@ -13,7 +13,7 @@ def ipv4_to_bin(ip): The IP address is in dotted decimal notation. ''' args = [int(arg) for arg in ip.split('.')] - return ipNum(*args) + return ipv4_arg_to_bin(*args) def ipv4_to_str(ip): @@ -66,5 +66,5 @@ def bin_to_ipv6(bin_addr): if __name__ == '__main__': a = ipv4_to_bin('10.28.197.1') print ipv4_to_str(a) - print bin_to_ipv6(ipv6_to_bin('0:10::1:2')) + print bin_to_ipv6(ipv6_to_bin('3f:10::1:2')) print bin_to_ipv6(ipv6_to_bin('2013:da8:215:8f2:aa20:66ff:fe4c:9c3c')) -- 1.7.12.4 (Apple Git-37)