From db1bd93230eefa007ca1f543eea89feade8f70b5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 1 Aug 2013 13:54:58 +0900 Subject: topology.switches: update after packet lib api changes Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/topology/switches.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ryu/topology/switches.py b/ryu/topology/switches.py index 690a8fca..cf8fdea2 100644 --- a/ryu/topology/switches.py +++ b/ryu/topology/switches.py @@ -26,7 +26,7 @@ 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.mac import DONTCARE, haddr_to_str +from ryu.lib.mac import DONTCARE_STR, haddr_to_str from ryu.lib.dpid import dpid_to_str, str_to_dpid from ryu.lib.port_no import port_no_to_str from ryu.lib.packet import packet, ethernet, lldp @@ -431,7 +431,7 @@ class Switches(app_manager.RyuApp): event.EventLinkAdd, event.EventLinkDelete] DEFAULT_TTL = 120 # unused. ignored. - LLDP_PACKET_LEN = len(LLDPPacket.lldp_packet(0, 0, DONTCARE, 0)) + LLDP_PACKET_LEN = len(LLDPPacket.lldp_packet(0, 0, DONTCARE_STR, 0)) LLDP_SEND_GUARD = .05 LLDP_SEND_PERIOD_PER_PORT = .9 -- cgit v1.2.3