summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWASE Yusuke <iwase.yusuke0@gmail.com>2017-02-15 15:38:59 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2017-02-22 11:38:01 +0900
commitc1f810b9b1b648bc12a51b9495b76ee94f38ab50 (patch)
treef7084e830cf9f55e6f5ce8dcd0b376e65e29d608
parentfd96d243147d198da6b2dc648391908973dba9e3 (diff)
bgp/utils/bgp: Use lib/ip for Python 3 compatibility
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/services/protocols/bgp/utils/bgp.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ryu/services/protocols/bgp/utils/bgp.py b/ryu/services/protocols/bgp/utils/bgp.py
index 4979e441..4bdedf00 100644
--- a/ryu/services/protocols/bgp/utils/bgp.py
+++ b/ryu/services/protocols/bgp/utils/bgp.py
@@ -17,10 +17,10 @@
Utilities related to bgp data types and models.
"""
import logging
-import socket
import netaddr
+from ryu.lib import ip
from ryu.lib.packet.bgp import (
BGPUpdate,
RF_IPv4_UC,
@@ -107,8 +107,7 @@ def from_inet_ptoi(bgp_id):
"""
four_byte_id = None
try:
- packed_byte = socket.inet_pton(socket.AF_INET, bgp_id)
- four_byte_id = int(packed_byte.encode('hex'), 16)
+ four_byte_id = ip.ipv4_to_int(bgp_id)
except ValueError:
LOG.debug('Invalid bgp id given for conversion to integer value %s',
bgp_id)