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

Nmstatectl: Use keyword arguments

Browse Source 
Use keyword arguments for API functions in case they will become
keyword-only in the future.

Signed-off-by: Till Maas <opensource@till.name>
This commit is contained in:
Till Maas 2020-01-30 16:54:06 +01:00
parent 8585d91ebf
commit 62c6d35175
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nmstatectl/nmstatectl.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
#
@ -159,7 +159,7 @@ def setup_subcommand_show(subparsers):
def commit(args):
try:
libnmstate.commit(args.checkpoint)
libnmstate.commit(checkpoint=args.checkpoint)
except NmstateValueError as e:
print("ERROR committing change: {}\n".format(str(e)))
return os.EX_DATAERR
@ -193,7 +193,7 @@ def edit(args):
def rollback(args):
try:
libnmstate.rollback(args.checkpoint)
libnmstate.rollback(checkpoint=args.checkpoint)
except NmstateValueError as e:
print("ERROR rolling back change: {}\n".format(str(e)))
return os.EX_DATAERR
@ -234,7 +234,12 @@ def apply_state(statedata, verify_change, commit, timeout):
use_yaml = True
try:
checkpoint = libnmstate.apply(state, verify_change, commit, timeout)
checkpoint = libnmstate.apply(
state,
verify_change=verify_change,
commit=commit,
rollback_timeout=timeout,
)
except NmstatePermissionError as e:
sys.stderr.write("ERROR: Missing permissions:{}\n".format(str(e)))
return os.EX_NOPERM

4
tests/ctl/nmstatectl_test.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
#
@ -70,7 +70,7 @@ interfaces:
@mock.patch.object(
nmstatectl.libnmstate,
"apply",
lambda state, verify_change, commit, timeout: None,
lambda state, verify_change=True, commit=True, rollback_timeout=60: None,
)
@mock.patch.object(
nmstatectl, "open", mock.mock_open(read_data="{}"), create=True