diff options
| -rw-r--r-- | ryu/services/protocols/zebra/client/zclient.py | 11 | ||||
| -rw-r--r-- | ryu/services/protocols/zebra/event.py | 2 | ||||
| -rw-r--r-- | 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 570a42c8..7a7816a5 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 030909c3..47c4c2c9 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 f8119900..e12ce005 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, |