dbus: Allow Set without origin hint #294

marex · 2022-11-05T21:30:36Z

Allow Set "s" signature, where the origin hint is left out entirely instead of requiring Set "ss" signature where the origin hint is an empty string.

The following become identical:
$ busctl call io.netplan.Netplan /io/netplan/Netplan/config/ULJIU0 io.netplan.Netplan.Config Set ss "ethernets.eth0={dhcp4: false, dhcp6: true}" ""
$ busctl call io.netplan.Netplan /io/netplan/Netplan/config/ULJIU0 io.netplan.Netplan.Config Set s "ethernets.eth0={dhcp4: false, dhcp6: true}"

Description

Checklist

Runs make check successfully.
Retains 100% code coverage (make check-coverage).
New/changed keys in YAML format are documented.
(Optional) Adds example YAML for new feature.
(Optional) Closes an open bug in Launchpad.

Allow Set "s" signature, where the origin hint is left out entirely instead of requiring Set "ss" signature where the origin hint is an empty string. The following become identical: $ busctl call io.netplan.Netplan /io/netplan/Netplan/config/ULJIU0 io.netplan.Netplan.Config Set ss "ethernets.eth0={dhcp4: false, dhcp6: true}" "" $ busctl call io.netplan.Netplan /io/netplan/Netplan/config/ULJIU0 io.netplan.Netplan.Config Set s "ethernets.eth0={dhcp4: false, dhcp6: true}"

slyon

Thank you for your contribution to Netplan!

I like the overall approach of this PR, and I remember that I wanted to do something similar in the first place, when this feature was first implemented, but hit some roadblocks back then..

I wonder if this is the same issue we're seeing here in the failing tests (conflict in vtable)?

Could you please have a look at that and fix the tests (+coverage, if needed)?

slyon · 2022-11-15T16:47:11Z

src/dbus.c

+    SD_BUS_METHOD("Set", "s", "b", method_config_set_simple, 0),
+    SD_BUS_METHOD("Set", "ss", "b", method_config_set_full, 0),


There seems to be a conflict in the vtable here, which makes the tests fail...
I'm not sure if we can have two methods using a different signature. Could you please investigate this?

$ NETPLAN_GENERATE_PATH=build/src/generate NETPLAN_DBUS_CMD=build/dbus/netplan-dbus LD_LIBRARY_PATH=build/src PYTHONPATH=. pytest-3 -v tests/dbus/ ================================================================= test session starts ================================================================= platform linux -- Python 3.10.6, pytest-6.2.5, py-1.10.0, pluggy-0.13.0 -- /usr/bin/python3 cachedir: .pytest_cache rootdir: /home/lukas/canonical/netplan collected 25 items tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_apply_in_snap_calls_busctl PASSED [ 4%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_apply_in_snap_calls_busctl_err PASSED [ 8%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_apply_in_snap_calls_busctl_ret130 PASSED [ 12%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_apply_in_snap_uses_dbus PASSED [ 16%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config FAILED [ 20%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_apply FAILED [ 24%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_cancel FAILED [ 28%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_get FAILED [ 32%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set FAILED [ 36%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_invalidate FAILED [ 40%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_uninvalidate FAILED [ 44%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_uninvalidate_timeout FAILED [ 48%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_apply FAILED [ 52%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_cancel FAILED [ 56%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_cb FAILED [ 60%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_config_try FAILED [ 64%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_no_ready_signal FAILED [ 68%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_generate PASSED [ 72%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_happy PASSED [ 76%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_info PASSED [ 80%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_no_such_command PASSED [ 84%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_noroot PASSED [ 88%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_generate_in_snap_calls_busctl PASSED [ 92%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_generate_in_snap_calls_busctl_err PASSED [ 96%] tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_generate_in_snap_calls_busctl_ret130 PASSED [100%] ====================================================================== FAILURES ======================================================================= [...] =============================================================== short test summary info =============================================================== FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config - subprocess.CalledProcessError: Command '['busctl', 'call', '--system', '... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_apply - subprocess.CalledProcessError: Command '['busctl', 'call', '--syst... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_cancel - subprocess.CalledProcessError: Command '['busctl', 'call', '--sys... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_get - subprocess.CalledProcessError: Command '['busctl', 'call', '--system... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set - subprocess.CalledProcessError: Command '['busctl', 'call', '--system... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_invalidate - subprocess.CalledProcessError: Command '['busctl', 'call'... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_uninvalidate - subprocess.CalledProcessError: Command '['busctl', 'cal... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_set_uninvalidate_timeout - subprocess.CalledProcessError: Command '['busct... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_apply - subprocess.CalledProcessError: Command '['busctl', 'call', '--... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_cancel - subprocess.CalledProcessError: Command '['busctl', 'call', '-... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_cb - subprocess.CalledProcessError: Command '['busctl', 'call', '--sys... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_config_try - subprocess.CalledProcessError: Command '['busctl', 'call'... FAILED tests/dbus/test_dbus.py::TestNetplanDBus::test_netplan_dbus_config_try_no_ready_signal - subprocess.CalledProcessError: Command '['busctl', '... ===================================================== 13 failed, 12 passed, 7 warnings in 28.93s ======================================================

slyon requested changes Nov 15, 2022

View reviewed changes

slyon added the needswork Change looks good but requires a bit more work label Nov 23, 2022

slyon added the community This PR has been proposed by somebody outside of the Netplan team and roadmap commitments. label Aug 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dbus: Allow Set without origin hint #294

dbus: Allow Set without origin hint #294

marex commented Nov 5, 2022

slyon left a comment

slyon Nov 15, 2022

		SD_BUS_METHOD("Set", "s", "b", method_config_set_simple, 0),
		SD_BUS_METHOD("Set", "ss", "b", method_config_set_full, 0),

dbus: Allow Set without origin hint #294

Are you sure you want to change the base?

dbus: Allow Set without origin hint #294

Conversation

marex commented Nov 5, 2022

Description

Checklist

slyon left a comment

Choose a reason for hiding this comment

slyon Nov 15, 2022

Choose a reason for hiding this comment