use dpid_to_str in some places

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

2 files changed, 8 insertions, 4 deletions

diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py
index 7a99a05a..66d50a32 100644
--- a/ryu/controller/controller.py
+++ b/ryu/controller/controller.py
@@ -38,6 +38,8 @@ from ryu.ofproto import nx_match
 from ryu.controller import handler
 from ryu.controller import ofp_event
 
+from ryu.lib.dpid import dpid_to_str
+
 LOG = logging.getLogger('ryu.controller.controller')
 
 CONF = cfg.CONF
@@ -314,5 +316,5 @@ def datapath_connection_factory(socket, address):
             # the parser raise exception.
             # Can we do anything more graceful?
             LOG.error("Error in the datapath %s from %s",
-                      datapath.id, address)
+                      dpid_to_str(datapath.id), address)
             raise
diff --git a/ryu/controller/dpset.py b/ryu/controller/dpset.py
index 0891c2e2..c172aec7 100644
--- a/ryu/controller/dpset.py
+++ b/ryu/controller/dpset.py
@@ -24,6 +24,8 @@ from ryu.controller import ofp_event
 from ryu.controller.handler import set_ev_cls
 import ryu.exception as ryu_exc
 
+from ryu.lib.dpid import dpid_to_str
+
 LOG = logging.getLogger('ryu.controller.dpset')
 
 DPSET_EV_DISPATCHER = "dpset"
@@ -174,20 +176,20 @@ class DPSet(app_manager.RyuApp):
         if reason == ofproto.OFPPR_ADD:
             LOG.debug('DPSET: A port was added.' +
                       '(datapath id = %s, port number = %s)',
-                      datapath.id, port.port_no)
+                      dpid_to_str(datapath.id), port.port_no)
             self._port_added(datapath, port)
             self.send_event_to_observers(EventPortAdd(datapath, port))
         elif reason == ofproto.OFPPR_DELETE:
             LOG.debug('DPSET: A port was deleted.' +
                       '(datapath id = %s, port number = %s)',
-                      datapath.id, port.port_no)
+                      dpid_to_str(datapath.id), port.port_no)
             self._port_deleted(datapath, port)
             self.send_event_to_observers(EventPortDelete(datapath, port))
         else:
             assert reason == ofproto.OFPPR_MODIFY
             LOG.debug('DPSET: A port was modified.' +
                       '(datapath id = %s, port number = %s)',
-                      datapath.id, port.port_no)
+                      dpid_to_str(datapath.id), port.port_no)
             self.port_state[datapath.id].modify(port.port_no, port)
             self.send_event_to_observers(EventPortModify(datapath, port))