From b39ff68f82b2699e1a6498c259f935df961addbe Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Wed, 18 Jul 2018 17:40:07 +0900 Subject: lib/ovs/bridge: Return multiple controllers OVSBridge may have more than one controller. Let get_controller() return a list of controllers in such cases. NOTE: this introduces incompatibility if multiple controllers are configured for a bridge. Signed-off-by: IWAMOTO Toshihiro Signed-off-by: FUJITA Tomonori --- ryu/lib/ovs/bridge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ryu/lib/ovs/bridge.py b/ryu/lib/ovs/bridge.py index 9753fa29..f86e9ae0 100644 --- a/ryu/lib/ovs/bridge.py +++ b/ryu/lib/ovs/bridge.py @@ -171,7 +171,8 @@ class OVSBridge(object): """ command = ovs_vsctl.VSCtlCommand('get-controller', [self.br_name]) self.run_command([command]) - return command.result[0] + result = command.result + return result[0] if len(result) == 1 else result def set_controller(self, controllers): """ -- cgit v1.2.3