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

test: Ignore route metric in test

Browse Source 
the `test_add_gateway` will fail if
`NetworkManager-config-connectivity-redhat` installed.

The `NetworkManager-config-connectivity-redhat` will add 20000 to
requested metric before global connectivity checks out.

Nmstate production code ignore metric during verification. Changed the
test case to ignore metric also.

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2023-01-06 16:12:05 +08:00
parent 78dc99fcd5
commit efd2e53023
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/route_test.py
View File

@ -235,8 +235,8 @@ def _assert_routes(routes, state, nic="eth1"):
"""
routes = copy.deepcopy(routes)
for route in routes:
if Route.METRIC not in route:
route[Route.METRIC] = Route.USE_DEFAULT_METRIC
# Ignore metric difference like nmstate production code
route.pop(Route.METRIC, None)
if Route.TABLE_ID not in route:
route[Route.TABLE_ID] = Route.USE_DEFAULT_ROUTE_TABLE
routes.sort(key=_route_sort_key)
@ -259,11 +259,8 @@ def _assert_routes(routes, state, nic="eth1"):
def _assert_in_current_route(route, current_routes):
route_in_current_routes = False
for current_route in current_routes:
metric = route.get(Route.METRIC, Route.USE_DEFAULT_METRIC)
current_route.pop(Route.METRIC, None)
table_id = route.get(Route.TABLE_ID, Route.USE_DEFAULT_ROUTE_TABLE)
if metric == Route.USE_DEFAULT_METRIC:
current_route = copy.deepcopy(current_route)
current_route[Route.METRIC] = Route.USE_DEFAULT_METRIC
if table_id == Route.USE_DEFAULT_ROUTE_TABLE:
current_route = copy.deepcopy(current_route)
current_route[Route.TABLE_ID] = Route.USE_DEFAULT_ROUTE_TABLE