openstack/os-ken
Code Issues Proposed changes

topology.switches: fix link discovery

Browse Source 
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 <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-09-26 15:40:04 +09:00 committed by FUJITA Tomonori
parent 3aefc92ea8
commit 8cbfc3f55a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ryu/topology/switches.py
View File

@ -25,7 +25,7 @@ from ryu.controller import ofp_event
from ryu.controller.handler import set_ev_cls from ryu.controller.handler import set_ev_cls
from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER
from ryu.exception import RyuException 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.mac import DONTCARE_STR
from ryu.lib.dpid import dpid_to_str, str_to_dpid from ryu.lib.dpid import dpid_to_str, str_to_dpid
from ryu.lib.port_no import port_no_to_str from ryu.lib.port_no import port_no_to_str
@ -537,7 +537,8 @@ class Switches(app_manager.RyuApp):
# TODO:XXX need other versions # TODO:XXX need other versions
if ofproto.OFP_VERSION == ofproto_v1_0.OFP_VERSION: if ofproto.OFP_VERSION == ofproto_v1_0.OFP_VERSION:
rule = nx_match.ClsRule() 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) rule.set_dl_type(ETH_TYPE_LLDP)
actions = [ofproto_parser.OFPActionOutput( actions = [ofproto_parser.OFPActionOutput(
ofproto.OFPP_CONTROLLER, self.LLDP_PACKET_LEN)] ofproto.OFPP_CONTROLLER, self.LLDP_PACKET_LEN)]