diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-08-22 17:21:26 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-08-25 13:32:52 +0900 |
| commit | aeda7ae4c5e7a08596e2ecedfb089b78fe879a08 (patch) | |
| tree | 42dfe418296d52cd7545b165cd0505d0c0279cc2 | |
| parent | c51c46b584eee1db6d2152aacbfa9e9a17a7e13b (diff) | |
BGPSpeaker: Support Python3 on SSH console
Currently, SSH console of BGPSpeaker fails to recieve commands from
user when it is running on Python3 due to the binary conversion.
This patch fixes this problem and enables to use SSH console on
Python3.
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py | 2 | ||||
| -rw-r--r-- | ryu/services/protocols/bgp/operator/ssh.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py b/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py index e29c7c7f..4e0a9b38 100644 --- a/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py +++ b/ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py @@ -41,7 +41,7 @@ class RouteFormatterMixin(object): prefix = path.get('prefix') # Append path info to String buffer. - buff.write(cls.fmtstr.format(path_status, prefix, labels, + buff.write(cls.fmtstr.format(path_status, prefix, str(labels), next_hop, bpr, str(med), str(localpref), ' '.join(map(str, aspath)))) diff --git a/ryu/services/protocols/bgp/operator/ssh.py b/ryu/services/protocols/bgp/operator/ssh.py index 8a584db9..4187332e 100644 --- a/ryu/services/protocols/bgp/operator/ssh.py +++ b/ryu/services/protocols/bgp/operator/ssh.py @@ -152,6 +152,7 @@ Hello, this is Ryu BGP speaker (version %s). def _handle_csi_seq(self): c = self.chan.recv(1) + c = c.decode() # For Python3 compatibility if c == 'A': self._lookup_hist_up() elif c == 'B': @@ -165,13 +166,14 @@ Hello, this is Ryu BGP speaker (version %s). def _handle_esc_seq(self): c = self.chan.recv(1) + c = c.decode() # For Python3 compatibility if c == '[': self._handle_csi_seq() else: LOG.error("non CSI sequence. do nothing") def _send_csi_seq(self, cmd): - self.chan.send(b'\x1b[' + cmd) + self.chan.send('\x1b[' + cmd) def _movcursor(self, curpos): if self.prompted and curpos < len(self.PROMPT): @@ -347,6 +349,7 @@ Hello, this is Ryu BGP speaker (version %s). while True: c = self.chan.recv(1) + c = c.decode() # For Python3 compatibility if len(c) == 0: break |