diff options
Diffstat (limited to 'os_net_config/objects.py')
| -rw-r--r-- | os_net_config/objects.py | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/os_net_config/objects.py b/os_net_config/objects.py index e3d8978..3136be0 100644 --- a/os_net_config/objects.py +++ b/os_net_config/objects.py @@ -441,8 +441,7 @@ class OvsBridge(_BaseOpts): ovs_options = json.get('ovs_options') ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] fail_mode = json.get('ovs_fail_mode', DEFAULT_OVS_BRIDGE_FAIL_MODE) members = [] @@ -509,8 +508,7 @@ class OvsUserBridge(_BaseOpts): ovs_options = json.get('ovs_options') ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] fail_mode = json.get('ovs_fail_mode', DEFAULT_OVS_BRIDGE_FAIL_MODE) members = [] @@ -866,9 +864,8 @@ class OvsBond(_BaseOpts): json, include_primary=False) ovs_options = json.get('ovs_options') ovs_extra = json.get('ovs_extra', []) - if ovs_extra and not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + if not isinstance(ovs_extra, list): + ovs_extra = [ovs_extra] members = [] # members @@ -916,8 +913,7 @@ class OvsTunnel(_BaseOpts): ovs_options = ['options:%s' % opt for opt in ovs_options] ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] opts = _BaseOpts.base_opts_from_json(json) return OvsTunnel(name, *opts, tunnel_type=tunnel_type, ovs_options=ovs_options, ovs_extra=ovs_extra) @@ -953,8 +949,7 @@ class OvsPatchPort(_BaseOpts): ovs_options = ['options:%s' % opt for opt in ovs_options] ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] opts = _BaseOpts.base_opts_from_json(json) return OvsPatchPort(name, *opts, bridge_name=bridge_name, peer=peer, ovs_options=ovs_options, ovs_extra=ovs_extra) @@ -1039,8 +1034,7 @@ class OvsDpdkPort(_BaseOpts): ovs_options = ['options:%s' % opt for opt in ovs_options] ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] opts = _BaseOpts.base_opts_from_json(json) return OvsDpdkPort(name, *opts, members=members, driver=driver, ovs_options=ovs_options, ovs_extra=ovs_extra) @@ -1086,8 +1080,7 @@ class OvsDpdkBond(_BaseOpts): ovs_options = json.get('ovs_options') ovs_extra = json.get('ovs_extra', []) if not isinstance(ovs_extra, list): - msg = 'ovs_extra must be a list.' - raise InvalidConfigException(msg) + ovs_extra = [ovs_extra] members = [] # members |