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

nm device: Fix the incorrect interface state

Browse Source 
In `nm/active_connection.py`, the `ActiveConnetion.is_active`
treat device state between IP_CONFIG and ACTIVATED as activated,

While at the query stage, the nm/translator.py only treat
IP_CONFIG and ACTIVATED as `InterfaceState.UP`, not between.

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2019-11-20 12:33:25 +08:00
parent f70fe88bc0
commit a613f56239
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnmstate/nm/translator.py
View File

@ -117,10 +117,11 @@ class Nm2Api(object):
return Nm2Api._iface_types_map.get(name, IFACE_TYPE_UNKNOWN)
@staticmethod
def get_iface_admin_state(state_name):
if state_name in (
nmclient.NM.DeviceState.ACTIVATED,
nmclient.NM.DeviceState.IP_CONFIG,
def get_iface_admin_state(dev_state):
if (
nmclient.NM.DeviceState.IP_CONFIG
<= dev_state
<= nmclient.NM.DeviceState.ACTIVATED
):
return ApiIfaceAdminState.UP
return ApiIfaceAdminState.DOWN

15
tests/lib/nm/translator_test.py
View File

@ -75,12 +75,15 @@ def test_api2nm_bond_options():
assert {'miimon': 120, 'mode': 'balance-rr'} == nm_bond_options
def test_nm2api_common_device_info():
def test_nm2api_common_device_info(NM_mock):
NM_mock.DeviceState.ACTIVATED = 100
NM_mock.DeviceState.IP_CONFIG = 70
nm.nmclient.NM.DeviceState.DISCONNECTED = 30
devinfo = {
'name': 'devname',
'type_id': 'devtypeid',
'type_name': 'devtypename',
'state': 'devstate',
'state': nm.nmclient.NM.DeviceState.DISCONNECTED,
}
info = nm.translator.Nm2Api.get_common_device_info(devinfo)
@ -110,7 +113,11 @@ def test_nm2api_bond_info():
def test_iface_admin_state(NM_mock):
NM_mock.DeviceState.ACTIVATED = 'ACTIVATED'
admin_state = nm.translator.Nm2Api.get_iface_admin_state('ACTIVATED')
NM_mock.DeviceState.ACTIVATED = 100
NM_mock.DeviceState.IP_CONFIG = 70
NM_mock.DeviceState.IP_CHECK = 80
admin_state = nm.translator.Nm2Api.get_iface_admin_state(
NM_mock.DeviceState.IP_CHECK
)
assert nm.translator.ApiIfaceAdminState.UP == admin_state