tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm, ovs: Remove translate port options step

Browse Source 
The OVS port options translation step has no added value at the moment.
Originally, the intention was to use a translation step between the nmstate
public state and the nm provider one, assuming that the two do not have
to be the same. However, the translation did not evolve to anything
useful and an 1:1 relation was always kept.

Therefore, it is dropped.

Signed-off-by: Edward Haas <edwardh@redhat.com>
This commit is contained in:
Edward Haas 2020-02-09 16:09:29 +02:00 committed by Till Maas
parent bcc6a7ab0f
commit 9adfaa7c78
4 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnmstate/nm/applier.py
View File

@ -311,9 +311,8 @@ def prepare_proxy_ifaces_desired_state(ifaces_desired_state):
port_opts_metadata = iface_desired_state.get(BRPORT_OPTIONS_METADATA)
if port_opts_metadata is None:
continue
port_options = ovs.translate_port_options(port_opts_metadata)
port_iface_desired_state = _create_ovs_port_iface_desired_state(
iface_desired_state, port_options
iface_desired_state, port_opts_metadata
)
new_ifaces_desired_state.append(port_iface_desired_state)
# The "visible" slave/interface needs to point to the port profile

30
libnmstate/nm/ovs.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2018-2019 Red Hat, Inc.
# Copyright (c) 2018-2020 Red Hat, Inc.
#
# This file is part of nmstate
#
@ -35,16 +35,6 @@ CAPABILITY = "openvswitch"
_BRIDGE_OPTION_NAMES = ["fail-mode", "mcast-snooping-enable", "rstp", "stp"]
_PORT_OPTION_NAMES = [
"tag",
"vlan-mode",
"bond-mode",
"lacp",
"bond-updelay",
"bond-downdelay",
]
def has_ovs_capability():
try:
nmclient.NM.DeviceType.OVS_BRIDGE
@ -75,9 +65,9 @@ def create_bridge_setting(options):
return bridge_setting
def create_port_setting(options):
def create_port_setting(port_state):
port_setting = nmclient.NM.SettingOvsPort.new()
for option_name, option_value in options.items():
for option_name, option_value in port_state.items():
if option_name == "tag":
port_setting.props.tag = option_value
elif option_name == "vlan-mode":
@ -90,12 +80,6 @@ def create_port_setting(options):
port_setting.props.bond_updelay = option_value
elif option_name == "bond-downdelay":
port_setting.props.bond_downdelay = option_value
else:
raise NmstateValueError(
"Invalid OVS port option: '{}'='{}'".format(
option_name, option_value
)
)
return port_setting
@ -115,14 +99,6 @@ def translate_bridge_options(iface_state):
return br_opts
def translate_port_options(port_state):
port_opts = {}
for key in port_state.keys() & set(_PORT_OPTION_NAMES):
port_opts[key] = port_state[key]
return port_opts
def is_ovs_bridge_type_id(type_id):
return type_id == nmclient.NM.DeviceType.OVS_BRIDGE

3
tests/integration/nm/ovs_test.py
View File

@ -208,8 +208,7 @@ def _create_port_setting(port_state, port_profile_name):
iface_type=nm.ovs.PORT_TYPE,
)
iface_con_setting.set_master(BRIDGE0, nm.ovs.BRIDGE_TYPE)
port_options = nm.ovs.translate_port_options(port_state)
bridge_port_setting = nm.ovs.create_port_setting(port_options)
bridge_port_setting = nm.ovs.create_port_setting(port_state)
return iface_con_setting.setting, bridge_port_setting

2
tests/lib/nm/applier_test.py
View File

@ -78,7 +78,6 @@ def test_prepare_new_ifaces_configuration(
nm_bond_mock, nm_connection_mock, nm_ipv4_mock, nm_ipv6_mock, nm_ovs_mock
):
nm_ovs_mock.translate_bridge_options.return_value = {}
nm_ovs_mock.translate_port_options.return_value = {}
ifaces_desired_state = [
{
@ -160,7 +159,6 @@ def test_prepare_edited_ifaces_configuration(
nm_device_mock, nm_connection_mock, nm_ipv4_mock, nm_ipv6_mock, nm_ovs_mock
):
nm_ovs_mock.translate_bridge_options.return_value = {}
nm_ovs_mock.translate_port_options.return_value = {}
ifaces_desired_state = [
{"name": "eth0", "type": "ethernet", "state": "up"}