Signed-off-by: IWASE Yusuke <iwase.yusu...@gmail.com>
---
ryu/services/protocols/zebra/client/zclient.py | 11 +++++++----
ryu/services/protocols/zebra/event.py | 2 +-
ryu/services/protocols/zebra/server/zserver.py | 2 ++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ryu/services/protocols/zebra/client/zclient.py
b/ryu/services/protocols/zebra/client/zclient.py
index 570a42c..7a7816a 100644
--- a/ryu/services/protocols/zebra/client/zclient.py
+++ b/ryu/services/protocols/zebra/client/zclient.py
@@ -116,15 +116,17 @@ class ZServer(object):
self.client.send_msg(
zebra.ZebraMessage(
version=self.client.zserv_ver,
- body=zebra.ZebraHello(self.client.route_type)))
+ body=zebra.ZebraHello(
+ route_type=self.client.route_type,
+ instance=0)))
self.client.send_msg(
zebra.ZebraMessage(
version=self.client.zserv_ver,
- command=zebra.ZEBRA_ROUTER_ID_ADD))
+ body=zebra.ZebraRouterIDAdd()))
self.client.send_msg(
zebra.ZebraMessage(
version=self.client.zserv_ver,
- command=zebra.ZEBRA_INTERFACE_ADD))
+ body=zebra.ZebraInterfaceAdd()))
self.client.send_event_to_observers(
zclient_event.EventZServConnected(self))
@@ -285,7 +287,8 @@ class ZClient(RyuApp):
distance=distance,
metric=metric,
mtu=mtu,
- tag=tag))
+ tag=tag,
+ instance=0))
self.send_msg(msg)
return msg
diff --git a/ryu/services/protocols/zebra/event.py
b/ryu/services/protocols/zebra/event.py
index 030909c..47c4c2c 100644
--- a/ryu/services/protocols/zebra/event.py
+++ b/ryu/services/protocols/zebra/event.py
@@ -90,7 +90,7 @@ def message_to_event(zclient, msg):
if not isinstance(msg, zebra.ZebraMessage):
return None
- body_cls = zebra._ZebraMessageBody.lookup_command(msg.command)
+ body_cls = msg.get_body_class(msg.version, msg.command)
ev_cls = getattr(MOD, _event_name(body_cls), None)
if ev_cls is None:
return None
diff --git a/ryu/services/protocols/zebra/server/zserver.py
b/ryu/services/protocols/zebra/server/zserver.py
index f811990..e12ce00 100644
--- a/ryu/services/protocols/zebra/server/zserver.py
+++ b/ryu/services/protocols/zebra/server/zserver.py
@@ -277,6 +277,8 @@ class ZServer(RyuApp):
ifindex=intf.ifindex,
status=intf.status,
if_flags=intf.flags,
+ ptm_enable=zebra.ZEBRA_IF_PTM_ENABLE_OFF,
+ ptm_status=zebra.ZEBRA_PTM_STATUS_UNKNOWN,
metric=intf.metric,
ifmtu=intf.ifmtu,
ifmtu6=intf.ifmtu6,
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
