From 8cbfc3f55a4f22077f9a6723b8938df0db61b121 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 26 Sep 2013 15:40:04 +0900 Subject: [PATCH] topology.switches: fix link discovery fix a regression introduced by text address changes. problem reported by Tonh o - Antonio Brasolin patch tested and fixed by YAMADA Hideki Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/topology/switches.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ryu/topology/switches.py b/ryu/topology/switches.py index 7cb0d26d..bd31fa16 100644 --- a/ryu/topology/switches.py +++ b/ryu/topology/switches.py @@ -25,7 +25,7 @@ from ryu.controller import ofp_event from ryu.controller.handler import set_ev_cls from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER from ryu.exception import RyuException -from ryu.lib import hub +from ryu.lib import addrconv, hub from ryu.lib.mac import DONTCARE_STR from ryu.lib.dpid import dpid_to_str, str_to_dpid from ryu.lib.port_no import port_no_to_str @@ -537,7 +537,8 @@ class Switches(app_manager.RyuApp): # TODO:XXX need other versions if ofproto.OFP_VERSION == ofproto_v1_0.OFP_VERSION: rule = nx_match.ClsRule() - rule.set_dl_dst(lldp.LLDP_MAC_NEAREST_BRIDGE) + rule.set_dl_dst(addrconv.mac.text_to_bin( + lldp.LLDP_MAC_NEAREST_BRIDGE)) rule.set_dl_type(ETH_TYPE_LLDP) actions = [ofproto_parser.OFPActionOutput( ofproto.OFPP_CONTROLLER, self.LLDP_PACKET_LEN)]