summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-08-01 13:54:58 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-08-01 14:25:44 +0900
commitdb1bd93230eefa007ca1f543eea89feade8f70b5 (patch)
tree1ad59f17df890f7477b4eba98cee2c0af5524ee3
parentc14a4182d3bda7374e579ba4ee7cf78770b9b9b0 (diff)
topology.switches: update after packet lib api changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/topology/switches.py4
1 files 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