summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWASE Yusuke <iwase.yusuke0@gmail.com>2016-10-20 16:48:09 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-10-25 16:21:54 +0900
commit895ddfca263a2544ac27d906988c401974d99167 (patch)
treeb33eceaa92ab3bd1000330c15d6f57185a9a9007
parentb9aab0af3f1bf5f3a5f107c9c1d0df068d94b0aa (diff)
ovs/vsctl: Add missing required argument for find_vlan_bridge
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/lib/ovs/vsctl.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/ryu/lib/ovs/vsctl.py b/ryu/lib/ovs/vsctl.py
index b82b0718..f1454985 100644
--- a/ryu/lib/ovs/vsctl.py
+++ b/ryu/lib/ovs/vsctl.py
@@ -266,8 +266,13 @@ class VSCtlContext(object):
def add_port_to_cache(self, vsctl_bridge_parent, ovsrec_port):
tag = getattr(ovsrec_port, vswitch_idl.OVSREC_PORT_COL_TAG, None)
- if tag is not None and tag != [] and 0 <= tag < 4096:
- vlan_bridge = vsctl_bridge_parent.find_vlan_bridge()
+ if isinstance(tag, list):
+ if len(tag) == 0:
+ tag = 0
+ else:
+ tag = tag[0]
+ if tag is not None and 0 <= tag < 4096:
+ vlan_bridge = vsctl_bridge_parent.find_vlan_bridge(tag)
if vlan_bridge:
vsctl_bridge_parent = vlan_bridge