diff options
| author | YAMADA Hideki <yamada.hideki@po.ntts.co.jp> | 2014-06-17 13:42:21 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-06-18 00:39:00 +0900 |
| commit | e1cd4325ebb7d359a8340b72b839f103d2255da1 (patch) | |
| tree | 9c17ae00b420e91981a91d97da23f6dd225cd3bd | |
| parent | 712d599f541f3e7bbc14833e2b6f55de964eebdb (diff) | |
ws_topology: Avoid controller name confliction
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/app/ws_topology.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ryu/app/ws_topology.py b/ryu/app/ws_topology.py index 5679c9b8..d2f4257c 100644 --- a/ryu/app/ws_topology.py +++ b/ryu/app/ws_topology.py @@ -59,7 +59,7 @@ class WebSocketTopology(app_manager.RyuApp): self.rpc_clients = [] wsgi = kwargs['wsgi'] - wsgi.register(TopologyController, {'app': self}) + wsgi.register(WebSocketTopologyController, {'app': self}) @set_ev_cls(event.EventSwitchEnter) def _event_switch_enter_handler(self, ev): @@ -92,10 +92,11 @@ class WebSocketTopology(app_manager.RyuApp): self.logger.error(e) -class TopologyController(ControllerBase): +class WebSocketTopologyController(ControllerBase): def __init__(self, req, link, data, **config): - super(TopologyController, self).__init__(req, link, data, **config) + super(WebSocketTopologyController, self).__init__( + req, link, data, **config) self.app = data['app'] @websocket('topology', '/v1.0/topology/ws') |