diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-08-22 10:38:17 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-08-22 10:38:17 -0400 |
| commit | 941cbfec49a3ee2d2ff6aa3fa054fb2559886ca4 (patch) | |
| tree | 50b7273780a84fe7841bb78c08649d28782fb4e8 /os_net_config/objects.py | |
| parent | 3b5e8789871e1722f8a5122236893730cf3d1751 (diff) | |
Add support for ovs_extra.
Adds support for ovs_extra to the OVS Bridge and
OVS bond objects.
Diffstat (limited to 'os_net_config/objects.py')
| -rw-r--r-- | os_net_config/objects.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/os_net_config/objects.py b/os_net_config/objects.py index 12b1c99..4a43528 100644 --- a/os_net_config/objects.py +++ b/os_net_config/objects.py @@ -216,11 +216,13 @@ class OvsBridge(_BaseOpts): """Base class for OVS bridges.""" def __init__(self, name, use_dhcp=False, use_dhcpv6=False, addresses=[], - routes=[], mtu=1500, members=[], ovs_options=None): + routes=[], mtu=1500, members=[], ovs_options=None, + ovs_extra=[]): super(OvsBridge, self).__init__(name, use_dhcp, use_dhcpv6, addresses, routes, mtu, False) self.members = members self.ovs_options = ovs_options + self.ovs_extra = ovs_extra for member in self.members: member.bridge_name = name member.ovs_port = True @@ -238,6 +240,7 @@ class OvsBridge(_BaseOpts): name = _get_required_field(json, 'name', 'OvsBridge') opts = _BaseOpts.base_opts_from_json(json, include_primary=False) ovs_options = json.get('ovs_options') + ovs_extra = json.get('ovs_extra', []) members = [] # members @@ -250,7 +253,8 @@ class OvsBridge(_BaseOpts): msg = 'Members must be a list.' raise InvalidConfigException(msg) - return OvsBridge(name, *opts, members=members, ovs_options=ovs_options) + return OvsBridge(name, *opts, members=members, ovs_options=ovs_options, + ovs_extra=ovs_extra) class OvsBond(_BaseOpts): @@ -258,11 +262,12 @@ class OvsBond(_BaseOpts): def __init__(self, name, use_dhcp=False, use_dhcpv6=False, addresses=[], routes=[], mtu=1500, primary=False, members=[], - ovs_options=None): + ovs_options=None, ovs_extra=[]): super(OvsBond, self).__init__(name, use_dhcp, use_dhcpv6, addresses, routes, mtu, primary) self.members = members self.ovs_options = ovs_options + self.ovs_extra = ovs_extra for member in self.members: if member.primary: if self.primary_interface_name: @@ -278,6 +283,7 @@ class OvsBond(_BaseOpts): name = _get_required_field(json, 'name', 'OvsBond') opts = _BaseOpts.base_opts_from_json(json) ovs_options = json.get('ovs_options') + ovs_extra = json.get('ovs_extra', []) members = [] # members @@ -290,4 +296,5 @@ class OvsBond(_BaseOpts): msg = 'Members must be a list.' raise InvalidConfigException(msg) - return OvsBond(name, *opts, members=members, ovs_options=ovs_options) + return OvsBond(name, *opts, members=members, ovs_options=ovs_options, + ovs_extra=ovs_extra) |