diff --git a/.gitignore b/.gitignore index e9c4ba359..45d9e3503 100644 --- a/.gitignore +++ b/.gitignore @@ -219,57 +219,57 @@ test-*.trs /po/quot.sed /po/remove-potcdate.sin -/src/NetworkManager -/src/NetworkManager-all-sym -/src/NetworkManager.ver -/src/devices/bluetooth/tests/nm-bt-test -/src/devices/tests/test-acd -/src/devices/tests/test-lldp -/src/devices/wifi/tests/test-devices-wifi -/src/devices/wwan/tests/test-service-providers -/src/dhcp/nm-dhcp-helper -/src/dhcp/tests/test-dhcp-dhclient -/src/dhcp/tests/test-dhcp-options -/src/dhcp/tests/test-dhcp-utils -/src/dnsmasq/tests/test-dnsmasq-utils -/src/initrd/nm-initrd-generator -/src/initrd/tests/test-cmdline-reader -/src/initrd/tests/test-dt-reader -/src/initrd/tests/test-ibft-reader -/src/nm-iface-helper -/src/ndisc/tests/test-ndisc-fake -/src/ndisc/tests/test-ndisc-linux -/src/platform/tests/monitor -/src/platform/tests/test-address-fake -/src/platform/tests/test-address-linux -/src/platform/tests/test-cleanup-fake -/src/platform/tests/test-cleanup-linux -/src/platform/tests/test-link-fake -/src/platform/tests/test-link-linux -/src/platform/tests/test-nmp-object -/src/platform/tests/test-platform-general -/src/platform/tests/test-route-fake -/src/platform/tests/test-route-linux -/src/platform/tests/test-tc-fake -/src/platform/tests/test-tc-linux -/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch] -/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh -/src/settings/plugins/ifupdown/tests/test-ifupdown -/src/settings/plugins/keyfile/tests/test-keyfile-settings -/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/ -/src/supplicant/tests/test-supplicant-config -/src/tests/config/test-config -/src/tests/test-core -/src/tests/test-core-with-expect -/src/tests/test-dcb -/src/tests/test-ip4-config -/src/tests/test-ip6-config -/src/tests/test-l3cfg -/src/tests/test-route-manager-fake -/src/tests/test-route-manager-linux -/src/tests/test-systemd -/src/tests/test-utils -/src/tests/test-wired-defname +/src/core/NetworkManager +/src/core/NetworkManager-all-sym +/src/core/NetworkManager.ver +/src/core/devices/bluetooth/tests/nm-bt-test +/src/core/devices/tests/test-acd +/src/core/devices/tests/test-lldp +/src/core/devices/wifi/tests/test-devices-wifi +/src/core/devices/wwan/tests/test-service-providers +/src/core/dhcp/nm-dhcp-helper +/src/core/dhcp/tests/test-dhcp-dhclient +/src/core/dhcp/tests/test-dhcp-options +/src/core/dhcp/tests/test-dhcp-utils +/src/core/dnsmasq/tests/test-dnsmasq-utils +/src/core/initrd/nm-initrd-generator +/src/core/initrd/tests/test-cmdline-reader +/src/core/initrd/tests/test-dt-reader +/src/core/initrd/tests/test-ibft-reader +/src/core/nm-iface-helper +/src/core/ndisc/tests/test-ndisc-fake +/src/core/ndisc/tests/test-ndisc-linux +/src/core/platform/tests/monitor +/src/core/platform/tests/test-address-fake +/src/core/platform/tests/test-address-linux +/src/core/platform/tests/test-cleanup-fake +/src/core/platform/tests/test-cleanup-linux +/src/core/platform/tests/test-link-fake +/src/core/platform/tests/test-link-linux +/src/core/platform/tests/test-nmp-object +/src/core/platform/tests/test-platform-general +/src/core/platform/tests/test-route-fake +/src/core/platform/tests/test-route-linux +/src/core/platform/tests/test-tc-fake +/src/core/platform/tests/test-tc-linux +/src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch] +/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +/src/core/settings/plugins/ifupdown/tests/test-ifupdown +/src/core/settings/plugins/keyfile/tests/test-keyfile-settings +/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/ +/src/core/supplicant/tests/test-supplicant-config +/src/core/tests/config/test-config +/src/core/tests/test-core +/src/core/tests/test-core-with-expect +/src/core/tests/test-dcb +/src/core/tests/test-ip4-config +/src/core/tests/test-ip6-config +/src/core/tests/test-l3cfg +/src/core/tests/test-route-manager-fake +/src/core/tests/test-route-manager-linux +/src/core/tests/test-systemd +/src/core/tests/test-utils +/src/core/tests/test-wired-defname /vapi/*.vapi @@ -369,3 +369,54 @@ test-*.trs /src/tests/test-general /src/tests/test-general-with-expect /src/tests/test-resolvconf-capture +/src/NetworkManager +/src/NetworkManager-all-sym +/src/NetworkManager.ver +/src/devices/bluetooth/tests/nm-bt-test +/src/devices/tests/test-acd +/src/devices/tests/test-lldp +/src/devices/wifi/tests/test-devices-wifi +/src/devices/wwan/tests/test-service-providers +/src/dhcp/nm-dhcp-helper +/src/dhcp/tests/test-dhcp-dhclient +/src/dhcp/tests/test-dhcp-options +/src/dhcp/tests/test-dhcp-utils +/src/dnsmasq/tests/test-dnsmasq-utils +/src/initrd/nm-initrd-generator +/src/initrd/tests/test-cmdline-reader +/src/initrd/tests/test-dt-reader +/src/initrd/tests/test-ibft-reader +/src/nm-iface-helper +/src/ndisc/tests/test-ndisc-fake +/src/ndisc/tests/test-ndisc-linux +/src/platform/tests/monitor +/src/platform/tests/test-address-fake +/src/platform/tests/test-address-linux +/src/platform/tests/test-cleanup-fake +/src/platform/tests/test-cleanup-linux +/src/platform/tests/test-link-fake +/src/platform/tests/test-link-linux +/src/platform/tests/test-nmp-object +/src/platform/tests/test-platform-general +/src/platform/tests/test-route-fake +/src/platform/tests/test-route-linux +/src/platform/tests/test-tc-fake +/src/platform/tests/test-tc-linux +/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch] +/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +/src/settings/plugins/ifupdown/tests/test-ifupdown +/src/settings/plugins/keyfile/tests/test-keyfile-settings +/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/ +/src/supplicant/tests/test-supplicant-config +/src/tests/config/test-config +/src/tests/test-core +/src/tests/test-core-with-expect +/src/tests/test-dcb +/src/tests/test-ip4-config +/src/tests/test-ip6-config +/src/tests/test-l3cfg +/src/tests/test-route-manager-fake +/src/tests/test-route-manager-linux +/src/tests/test-systemd +/src/tests/test-utils +/src/tests/test-wired-defname diff --git a/Makefile.am b/Makefile.am index 385e3385b..48cf7cfb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ shared/nm-udev-aux/.dirstamp: config-extra.h shared/systemd/.dirstamp: config-extra.h shared/systemd/src/basic/.dirstamp: config-extra.h shared/systemd/src/shared/.dirstamp: config-extra.h -src/dhcp/.dirstamp: config-extra.h +src/core/dhcp/.dirstamp: config-extra.h ############################################################################### @@ -135,8 +135,8 @@ set_sanitizer_env = \ fi check_so_symbols = \ - $(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \ - LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null + $(call set_sanitizer_env,$(1),$(builddir)/src/core/NetworkManager); \ + LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/core/NetworkManager --version >/dev/null ############################################################################### @@ -1232,13 +1232,13 @@ $(dispatcher_nm_dispatcher_OBJECTS): $(li $(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) libnm_core_libnm_core_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ @@ -1892,26 +1892,26 @@ EXTRA_DIST += \ libnm/tests/meson.build ############################################################################### -# src/ +# src/core/ ############################################################################### -src_cppflags_base = \ - -I$(srcdir)/src \ +src_core_cppflags_base = \ + -I$(srcdir)/src/core \ $(dflt_cppflags_libnm_core) \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -src_cppflags_base_test = \ - $(src_cppflags_base) \ +src_core_cppflags_base_test = \ + $(src_core_cppflags_base) \ -DNETWORKMANAGER_COMPILATION_TEST \ $(NULL) -src_cppflags_device_plugin = \ - $(src_cppflags_base) +src_core_cppflags_device_plugin = \ + $(src_core_cppflags_base) -src_cppflags = \ - $(src_cppflags_base) \ +src_core_cppflags = \ + $(src_core_cppflags_base) \ \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ @@ -1923,27 +1923,27 @@ src_cppflags = \ \ $(NULL) -src_cppflags_test = \ - $(src_cppflags) \ +src_core_cppflags_test = \ + $(src_core_cppflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ $(NULL) if REQUIRE_ROOT_TESTS -src_cppflags_test += -DREQUIRE_ROOT_TESTS=1 +src_core_cppflags_test += -DREQUIRE_ROOT_TESTS=1 endif -src_ldflags = $(CODE_COVERAGE_LDFLAGS) +src_core_ldflags = $(CODE_COVERAGE_LDFLAGS) sbin_PROGRAMS += \ - src/NetworkManager + src/core/NetworkManager libexec_PROGRAMS += \ - src/nm-iface-helper + src/core/nm-iface-helper noinst_LTLIBRARIES += \ - src/libNetworkManagerBase.la \ - src/libNetworkManager.la \ - src/libnm-systemd-core.la \ + src/core/libNetworkManagerBase.la \ + src/core/libNetworkManager.la \ + src/core/libnm-systemd-core.la \ $(NULL) check-config-options: @@ -2128,373 +2128,373 @@ shared_systemd_libnm_systemd_shared_la_LIBADD = \ ############################################################################### -src_libnm_systemd_core_la_cppflags = \ +src_core_libnm_systemd_core_la_cppflags = \ $(libsystemd_cppflags) \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/src \ - -I$(srcdir)/src/systemd/sd-adapt-core \ - -I$(srcdir)/src/systemd/src/systemd \ - -I$(srcdir)/src/systemd/src/libsystemd-network \ - -I$(srcdir)/src/systemd/src/libsystemd/sd-event \ + -I$(srcdir)/src/core \ + -I$(srcdir)/src/core/systemd/sd-adapt-core \ + -I$(srcdir)/src/core/systemd/src/systemd \ + -I$(srcdir)/src/core/systemd/src/libsystemd-network \ + -I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ $(NULL) -src_libnm_systemd_core_la_libadd = \ +src_core_libnm_systemd_core_la_libadd = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -src_libnm_systemd_core_la_SOURCES = \ - src/systemd/nm-sd-utils-core.c \ - src/systemd/nm-sd-utils-core.h \ - src/systemd/nm-sd.c \ - src/systemd/nm-sd.h \ - src/systemd/nm-sd-utils-dhcp.h \ - src/systemd/nm-sd-utils-dhcp.c \ - src/systemd/sd-adapt-core/condition.h \ - src/systemd/sd-adapt-core/conf-parser.h \ - src/systemd/sd-adapt-core/device-util.h \ - src/systemd/sd-adapt-core/khash.h \ - src/systemd/sd-adapt-core/network-util.h \ - src/systemd/sd-adapt-core/nm-sd-adapt-core.c \ - src/systemd/sd-adapt-core/nm-sd-adapt-core.h \ - src/systemd/sd-adapt-core/sd-daemon.h \ - src/systemd/sd-adapt-core/sd-device.h \ - src/systemd/sd-adapt-core/udev-util.h \ - src/systemd/src/libsystemd-network/arp-util.c \ - src/systemd/src/libsystemd-network/arp-util.h \ - src/systemd/src/libsystemd-network/dhcp-identifier.c \ - src/systemd/src/libsystemd-network/dhcp-identifier.h \ - src/systemd/src/libsystemd-network/dhcp-internal.h \ - src/systemd/src/libsystemd-network/dhcp-lease-internal.h \ - src/systemd/src/libsystemd-network/dhcp-network.c \ - src/systemd/src/libsystemd-network/dhcp-option.c \ - src/systemd/src/libsystemd-network/dhcp-packet.c \ - src/systemd/src/libsystemd-network/dhcp-protocol.h \ - src/systemd/src/libsystemd-network/dhcp6-internal.h \ - src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \ - src/systemd/src/libsystemd-network/dhcp6-network.c \ - src/systemd/src/libsystemd-network/dhcp6-option.c \ - src/systemd/src/libsystemd-network/dhcp6-protocol.h \ - src/systemd/src/libsystemd-network/lldp-internal.h \ - src/systemd/src/libsystemd-network/lldp-neighbor.c \ - src/systemd/src/libsystemd-network/lldp-neighbor.h \ - src/systemd/src/libsystemd-network/lldp-network.c \ - src/systemd/src/libsystemd-network/lldp-network.h \ - src/systemd/src/libsystemd-network/network-internal.c \ - src/systemd/src/libsystemd-network/network-internal.h \ - src/systemd/src/libsystemd-network/sd-dhcp-client.c \ - src/systemd/src/libsystemd-network/sd-dhcp-lease.c \ - src/systemd/src/libsystemd-network/sd-dhcp6-client.c \ - src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \ - src/systemd/src/libsystemd-network/sd-ipv4acd.c \ - src/systemd/src/libsystemd-network/sd-ipv4ll.c \ - src/systemd/src/libsystemd-network/sd-lldp.c \ - src/systemd/src/libsystemd/sd-event/event-source.h \ - src/systemd/src/libsystemd/sd-event/event-util.c \ - src/systemd/src/libsystemd/sd-event/event-util.h \ - src/systemd/src/libsystemd/sd-event/sd-event.c \ - src/systemd/src/libsystemd/sd-id128/id128-util.c \ - src/systemd/src/libsystemd/sd-id128/id128-util.h \ - src/systemd/src/libsystemd/sd-id128/sd-id128.c \ - src/systemd/src/systemd/_sd-common.h \ - src/systemd/src/systemd/sd-dhcp-client.h \ - src/systemd/src/systemd/sd-dhcp-lease.h \ - src/systemd/src/systemd/sd-dhcp-option.h \ - src/systemd/src/systemd/sd-dhcp6-client.h \ - src/systemd/src/systemd/sd-dhcp6-lease.h \ - src/systemd/src/systemd/sd-dhcp6-option.h \ - src/systemd/src/systemd/sd-event.h \ - src/systemd/src/systemd/sd-id128.h \ - src/systemd/src/systemd/sd-ipv4acd.h \ - src/systemd/src/systemd/sd-ipv4ll.h \ - src/systemd/src/systemd/sd-lldp.h \ - src/systemd/src/systemd/sd-ndisc.h \ +src_core_libnm_systemd_core_la_SOURCES = \ + src/core/systemd/nm-sd-utils-core.c \ + src/core/systemd/nm-sd-utils-core.h \ + src/core/systemd/nm-sd.c \ + src/core/systemd/nm-sd.h \ + src/core/systemd/nm-sd-utils-dhcp.h \ + src/core/systemd/nm-sd-utils-dhcp.c \ + src/core/systemd/sd-adapt-core/condition.h \ + src/core/systemd/sd-adapt-core/conf-parser.h \ + src/core/systemd/sd-adapt-core/device-util.h \ + src/core/systemd/sd-adapt-core/khash.h \ + src/core/systemd/sd-adapt-core/network-util.h \ + src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c \ + src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h \ + src/core/systemd/sd-adapt-core/sd-daemon.h \ + src/core/systemd/sd-adapt-core/sd-device.h \ + src/core/systemd/sd-adapt-core/udev-util.h \ + src/core/systemd/src/libsystemd-network/arp-util.c \ + src/core/systemd/src/libsystemd-network/arp-util.h \ + src/core/systemd/src/libsystemd-network/dhcp-identifier.c \ + src/core/systemd/src/libsystemd-network/dhcp-identifier.h \ + src/core/systemd/src/libsystemd-network/dhcp-internal.h \ + src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h \ + src/core/systemd/src/libsystemd-network/dhcp-network.c \ + src/core/systemd/src/libsystemd-network/dhcp-option.c \ + src/core/systemd/src/libsystemd-network/dhcp-packet.c \ + src/core/systemd/src/libsystemd-network/dhcp-protocol.h \ + src/core/systemd/src/libsystemd-network/dhcp6-internal.h \ + src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h \ + src/core/systemd/src/libsystemd-network/dhcp6-network.c \ + src/core/systemd/src/libsystemd-network/dhcp6-option.c \ + src/core/systemd/src/libsystemd-network/dhcp6-protocol.h \ + src/core/systemd/src/libsystemd-network/lldp-internal.h \ + src/core/systemd/src/libsystemd-network/lldp-neighbor.c \ + src/core/systemd/src/libsystemd-network/lldp-neighbor.h \ + src/core/systemd/src/libsystemd-network/lldp-network.c \ + src/core/systemd/src/libsystemd-network/lldp-network.h \ + src/core/systemd/src/libsystemd-network/network-internal.c \ + src/core/systemd/src/libsystemd-network/network-internal.h \ + src/core/systemd/src/libsystemd-network/sd-dhcp-client.c \ + src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c \ + src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c \ + src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c \ + src/core/systemd/src/libsystemd-network/sd-ipv4acd.c \ + src/core/systemd/src/libsystemd-network/sd-ipv4ll.c \ + src/core/systemd/src/libsystemd-network/sd-lldp.c \ + src/core/systemd/src/libsystemd/sd-event/event-source.h \ + src/core/systemd/src/libsystemd/sd-event/event-util.c \ + src/core/systemd/src/libsystemd/sd-event/event-util.h \ + src/core/systemd/src/libsystemd/sd-event/sd-event.c \ + src/core/systemd/src/libsystemd/sd-id128/id128-util.c \ + src/core/systemd/src/libsystemd/sd-id128/id128-util.h \ + src/core/systemd/src/libsystemd/sd-id128/sd-id128.c \ + src/core/systemd/src/systemd/_sd-common.h \ + src/core/systemd/src/systemd/sd-dhcp-client.h \ + src/core/systemd/src/systemd/sd-dhcp-lease.h \ + src/core/systemd/src/systemd/sd-dhcp-option.h \ + src/core/systemd/src/systemd/sd-dhcp6-client.h \ + src/core/systemd/src/systemd/sd-dhcp6-lease.h \ + src/core/systemd/src/systemd/sd-dhcp6-option.h \ + src/core/systemd/src/systemd/sd-event.h \ + src/core/systemd/src/systemd/sd-id128.h \ + src/core/systemd/src/systemd/sd-ipv4acd.h \ + src/core/systemd/src/systemd/sd-ipv4ll.h \ + src/core/systemd/src/systemd/sd-lldp.h \ + src/core/systemd/src/systemd/sd-ndisc.h \ $(NULL) -src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags) -src_libnm_systemd_core_la_LIBADD = \ +src_core_libnm_systemd_core_la_CPPFLAGS = $(src_core_libnm_systemd_core_la_cppflags) +src_core_libnm_systemd_core_la_LIBADD = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/systemd/meson.build + src/core/systemd/meson.build ############################################################################### -src_libNetworkManagerBase_la_CPPFLAGS = \ +src_core_libNetworkManagerBase_la_CPPFLAGS = \ $(libsystemd_cppflags) \ - $(src_cppflags) + $(src_core_cppflags) -src_libNetworkManagerBase_la_SOURCES = \ +src_core_libNetworkManagerBase_la_SOURCES = \ \ - src/nm-core-utils.c \ - src/nm-core-utils.h \ + src/core/nm-core-utils.c \ + src/core/nm-core-utils.h \ \ - src/NetworkManagerUtils.c \ - src/NetworkManagerUtils.h \ + src/core/NetworkManagerUtils.c \ + src/core/NetworkManagerUtils.h \ \ - src/platform/nmp-object.c \ - src/platform/nmp-object.h \ - src/platform/nm-platform.c \ - src/platform/nm-platform.h \ - src/platform/nm-platform-private.h \ - src/platform/nm-linux-platform.c \ - src/platform/nm-linux-platform.h \ - src/platform/nmp-rules-manager.c \ - src/platform/nmp-rules-manager.h \ - src/platform/wifi/nm-wifi-utils-nl80211.c \ - src/platform/wifi/nm-wifi-utils-nl80211.h \ - src/platform/wifi/nm-wifi-utils-private.h \ - src/platform/wifi/nm-wifi-utils.c \ - src/platform/wifi/nm-wifi-utils.h \ - src/platform/wpan/nm-wpan-utils.c \ - src/platform/wpan/nm-wpan-utils.h \ + src/core/platform/nmp-object.c \ + src/core/platform/nmp-object.h \ + src/core/platform/nm-platform.c \ + src/core/platform/nm-platform.h \ + src/core/platform/nm-platform-private.h \ + src/core/platform/nm-linux-platform.c \ + src/core/platform/nm-linux-platform.h \ + src/core/platform/nmp-rules-manager.c \ + src/core/platform/nmp-rules-manager.h \ + src/core/platform/wifi/nm-wifi-utils-nl80211.c \ + src/core/platform/wifi/nm-wifi-utils-nl80211.h \ + src/core/platform/wifi/nm-wifi-utils-private.h \ + src/core/platform/wifi/nm-wifi-utils.c \ + src/core/platform/wifi/nm-wifi-utils.h \ + src/core/platform/wpan/nm-wpan-utils.c \ + src/core/platform/wpan/nm-wpan-utils.h \ \ - src/ndisc/nm-lndp-ndisc.c \ - src/ndisc/nm-lndp-ndisc.h \ - src/ndisc/nm-ndisc.c \ - src/ndisc/nm-ndisc.h \ - src/ndisc/nm-ndisc-private.h \ + src/core/ndisc/nm-lndp-ndisc.c \ + src/core/ndisc/nm-lndp-ndisc.h \ + src/core/ndisc/nm-ndisc.c \ + src/core/ndisc/nm-ndisc.h \ + src/core/ndisc/nm-ndisc-private.h \ \ - src/nm-dbus-utils.c \ - src/nm-dbus-utils.h \ - src/nm-dbus-object.c \ - src/nm-dbus-object.h \ - src/nm-netns.c \ - src/nm-netns.h \ - src/nm-l3-config-data.c \ - src/nm-l3-config-data.h \ - src/nm-l3-ipv4ll.c \ - src/nm-l3-ipv4ll.h \ - src/nm-l3cfg.c \ - src/nm-l3cfg.h \ - src/nm-ip-config.c \ - src/nm-ip-config.h \ - src/nm-ip4-config.c \ - src/nm-ip4-config.h \ - src/nm-ip6-config.c \ - src/nm-ip6-config.h \ + src/core/nm-dbus-utils.c \ + src/core/nm-dbus-utils.h \ + src/core/nm-dbus-object.c \ + src/core/nm-dbus-object.h \ + src/core/nm-netns.c \ + src/core/nm-netns.h \ + src/core/nm-l3-config-data.c \ + src/core/nm-l3-config-data.h \ + src/core/nm-l3-ipv4ll.c \ + src/core/nm-l3-ipv4ll.h \ + src/core/nm-l3cfg.c \ + src/core/nm-l3cfg.h \ + src/core/nm-ip-config.c \ + src/core/nm-ip-config.h \ + src/core/nm-ip4-config.c \ + src/core/nm-ip4-config.h \ + src/core/nm-ip6-config.c \ + src/core/nm-ip6-config.h \ \ - src/dhcp/nm-dhcp-client.c \ - src/dhcp/nm-dhcp-client.h \ - src/dhcp/nm-dhcp-client-logging.h \ - src/dhcp/nm-dhcp-nettools.c \ - src/dhcp/nm-dhcp-utils.c \ - src/dhcp/nm-dhcp-utils.h \ - src/dhcp/nm-dhcp-options.c \ - src/dhcp/nm-dhcp-options.h \ - src/dhcp/nm-dhcp-systemd.c \ - src/dhcp/nm-dhcp-manager.c \ - src/dhcp/nm-dhcp-manager.h \ + src/core/dhcp/nm-dhcp-client.c \ + src/core/dhcp/nm-dhcp-client.h \ + src/core/dhcp/nm-dhcp-client-logging.h \ + src/core/dhcp/nm-dhcp-nettools.c \ + src/core/dhcp/nm-dhcp-utils.c \ + src/core/dhcp/nm-dhcp-utils.h \ + src/core/dhcp/nm-dhcp-options.c \ + src/core/dhcp/nm-dhcp-options.h \ + src/core/dhcp/nm-dhcp-systemd.c \ + src/core/dhcp/nm-dhcp-manager.c \ + src/core/dhcp/nm-dhcp-manager.h \ \ - src/main-utils.c \ - src/main-utils.h \ + src/core/main-utils.c \ + src/core/main-utils.h \ \ $(NULL) if WITH_WEXT -src_libNetworkManagerBase_la_SOURCES += \ - src/platform/wifi/nm-wifi-utils-wext.c \ - src/platform/wifi/nm-wifi-utils-wext.h +src_core_libNetworkManagerBase_la_SOURCES += \ + src/core/platform/wifi/nm-wifi-utils-wext.c \ + src/core/platform/wifi/nm-wifi-utils-wext.h endif -src_libNetworkManagerBase_la_LIBADD = \ +src_core_libNetworkManagerBase_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/platform/linux/nl802154.h + src/core/platform/linux/nl802154.h ############################################################################### -src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) +src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags) -src_libNetworkManager_la_SOURCES = \ +src_core_libNetworkManager_la_SOURCES = \ \ - src/nm-checkpoint.c \ - src/nm-checkpoint.h \ - src/nm-checkpoint-manager.c \ - src/nm-checkpoint-manager.h \ + src/core/nm-checkpoint.c \ + src/core/nm-checkpoint.h \ + src/core/nm-checkpoint-manager.c \ + src/core/nm-checkpoint-manager.h \ \ - src/devices/nm-acd-manager.c \ - src/devices/nm-acd-manager.h \ - src/devices/nm-lldp-listener.c \ - src/devices/nm-lldp-listener.h \ - src/devices/nm-device.c \ - src/devices/nm-device.h \ - src/devices/nm-device-ethernet-utils.c \ - src/devices/nm-device-ethernet-utils.h \ - src/devices/nm-device-factory.c \ - src/devices/nm-device-factory.h \ - src/devices/nm-device-generic.c \ - src/devices/nm-device-generic.h \ - src/devices/nm-device-logging.h \ - src/devices/nm-device-private.h \ + src/core/devices/nm-acd-manager.c \ + src/core/devices/nm-acd-manager.h \ + src/core/devices/nm-lldp-listener.c \ + src/core/devices/nm-lldp-listener.h \ + src/core/devices/nm-device.c \ + src/core/devices/nm-device.h \ + src/core/devices/nm-device-ethernet-utils.c \ + src/core/devices/nm-device-ethernet-utils.h \ + src/core/devices/nm-device-factory.c \ + src/core/devices/nm-device-factory.h \ + src/core/devices/nm-device-generic.c \ + src/core/devices/nm-device-generic.h \ + src/core/devices/nm-device-logging.h \ + src/core/devices/nm-device-private.h \ \ - src/devices/nm-device-6lowpan.c \ - src/devices/nm-device-6lowpan.h \ - src/devices/nm-device-bond.c \ - src/devices/nm-device-bond.h \ - src/devices/nm-device-bridge.c \ - src/devices/nm-device-bridge.h \ - src/devices/nm-device-dummy.c \ - src/devices/nm-device-dummy.h \ - src/devices/nm-device-ethernet.c \ - src/devices/nm-device-ethernet.h \ - src/devices/nm-device-infiniband.c \ - src/devices/nm-device-infiniband.h \ - src/devices/nm-device-ip-tunnel.c \ - src/devices/nm-device-ip-tunnel.h \ - src/devices/nm-device-macsec.c \ - src/devices/nm-device-macsec.h \ - src/devices/nm-device-macvlan.c \ - src/devices/nm-device-macvlan.h \ - src/devices/nm-device-ppp.c \ - src/devices/nm-device-ppp.h \ - src/devices/nm-device-tun.c \ - src/devices/nm-device-tun.h \ - src/devices/nm-device-veth.c \ - src/devices/nm-device-veth.h \ - src/devices/nm-device-vlan.c \ - src/devices/nm-device-vlan.h \ - src/devices/nm-device-vrf.c \ - src/devices/nm-device-vrf.h \ - src/devices/nm-device-vxlan.c \ - src/devices/nm-device-vxlan.h \ - src/devices/nm-device-wireguard.c \ - src/devices/nm-device-wireguard.h \ - src/devices/nm-device-wpan.c \ - src/devices/nm-device-wpan.h \ + src/core/devices/nm-device-6lowpan.c \ + src/core/devices/nm-device-6lowpan.h \ + src/core/devices/nm-device-bond.c \ + src/core/devices/nm-device-bond.h \ + src/core/devices/nm-device-bridge.c \ + src/core/devices/nm-device-bridge.h \ + src/core/devices/nm-device-dummy.c \ + src/core/devices/nm-device-dummy.h \ + src/core/devices/nm-device-ethernet.c \ + src/core/devices/nm-device-ethernet.h \ + src/core/devices/nm-device-infiniband.c \ + src/core/devices/nm-device-infiniband.h \ + src/core/devices/nm-device-ip-tunnel.c \ + src/core/devices/nm-device-ip-tunnel.h \ + src/core/devices/nm-device-macsec.c \ + src/core/devices/nm-device-macsec.h \ + src/core/devices/nm-device-macvlan.c \ + src/core/devices/nm-device-macvlan.h \ + src/core/devices/nm-device-ppp.c \ + src/core/devices/nm-device-ppp.h \ + src/core/devices/nm-device-tun.c \ + src/core/devices/nm-device-tun.h \ + src/core/devices/nm-device-veth.c \ + src/core/devices/nm-device-veth.h \ + src/core/devices/nm-device-vlan.c \ + src/core/devices/nm-device-vlan.h \ + src/core/devices/nm-device-vrf.c \ + src/core/devices/nm-device-vrf.h \ + src/core/devices/nm-device-vxlan.c \ + src/core/devices/nm-device-vxlan.h \ + src/core/devices/nm-device-wireguard.c \ + src/core/devices/nm-device-wireguard.h \ + src/core/devices/nm-device-wpan.c \ + src/core/devices/nm-device-wpan.h \ \ - src/dhcp/nm-dhcp-dhcpcanon.c \ - src/dhcp/nm-dhcp-dhclient.c \ - src/dhcp/nm-dhcp-dhcpcd.c \ - src/dhcp/nm-dhcp-helper-api.h \ - src/dhcp/nm-dhcp-listener.c \ - src/dhcp/nm-dhcp-listener.h \ - src/dhcp/nm-dhcp-dhclient-utils.c \ - src/dhcp/nm-dhcp-dhclient-utils.h \ + src/core/dhcp/nm-dhcp-dhcpcanon.c \ + src/core/dhcp/nm-dhcp-dhclient.c \ + src/core/dhcp/nm-dhcp-dhcpcd.c \ + src/core/dhcp/nm-dhcp-helper-api.h \ + src/core/dhcp/nm-dhcp-listener.c \ + src/core/dhcp/nm-dhcp-listener.h \ + src/core/dhcp/nm-dhcp-dhclient-utils.c \ + src/core/dhcp/nm-dhcp-dhclient-utils.h \ \ - src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h \ - src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h \ - src/dns/nm-dns-dnsmasq.c \ - src/dns/nm-dns-dnsmasq.h \ - src/dns/nm-dns-systemd-resolved.c \ - src/dns/nm-dns-systemd-resolved.h \ - src/dns/nm-dns-unbound.c \ - src/dns/nm-dns-unbound.h \ + src/core/dns/nm-dns-manager.c \ + src/core/dns/nm-dns-manager.h \ + src/core/dns/nm-dns-plugin.c \ + src/core/dns/nm-dns-plugin.h \ + src/core/dns/nm-dns-dnsmasq.c \ + src/core/dns/nm-dns-dnsmasq.h \ + src/core/dns/nm-dns-systemd-resolved.c \ + src/core/dns/nm-dns-systemd-resolved.h \ + src/core/dns/nm-dns-unbound.c \ + src/core/dns/nm-dns-unbound.h \ \ - src/dnsmasq/nm-dnsmasq-manager.c \ - src/dnsmasq/nm-dnsmasq-manager.h \ - src/dnsmasq/nm-dnsmasq-utils.c \ - src/dnsmasq/nm-dnsmasq-utils.h \ + src/core/dnsmasq/nm-dnsmasq-manager.c \ + src/core/dnsmasq/nm-dnsmasq-manager.h \ + src/core/dnsmasq/nm-dnsmasq-utils.c \ + src/core/dnsmasq/nm-dnsmasq-utils.h \ \ - src/ppp/nm-ppp-manager-call.c \ - src/ppp/nm-ppp-manager-call.h \ - src/ppp/nm-ppp-manager.h \ - src/ppp/nm-ppp-status.h \ + src/core/ppp/nm-ppp-manager-call.c \ + src/core/ppp/nm-ppp-manager-call.h \ + src/core/ppp/nm-ppp-manager.h \ + src/core/ppp/nm-ppp-status.h \ \ - src/nm-hostname-manager.c \ - src/nm-hostname-manager.h \ + src/core/nm-hostname-manager.c \ + src/core/nm-hostname-manager.h \ \ - src/settings/nm-agent-manager.c \ - src/settings/nm-agent-manager.h \ - src/settings/nm-secret-agent.c \ - src/settings/nm-secret-agent.h \ - src/settings/nm-settings-connection.c \ - src/settings/nm-settings-connection.h \ - src/settings/nm-settings-storage.c \ - src/settings/nm-settings-storage.h \ - src/settings/nm-settings-plugin.c \ - src/settings/nm-settings-plugin.h \ - src/settings/nm-settings.c \ - src/settings/nm-settings.h \ - src/settings/nm-settings-utils.c \ - src/settings/nm-settings-utils.h \ + src/core/settings/nm-agent-manager.c \ + src/core/settings/nm-agent-manager.h \ + src/core/settings/nm-secret-agent.c \ + src/core/settings/nm-secret-agent.h \ + src/core/settings/nm-settings-connection.c \ + src/core/settings/nm-settings-connection.h \ + src/core/settings/nm-settings-storage.c \ + src/core/settings/nm-settings-storage.h \ + src/core/settings/nm-settings-plugin.c \ + src/core/settings/nm-settings-plugin.h \ + src/core/settings/nm-settings.c \ + src/core/settings/nm-settings.h \ + src/core/settings/nm-settings-utils.c \ + src/core/settings/nm-settings-utils.h \ \ - src/settings/plugins/keyfile/nms-keyfile-storage.c \ - src/settings/plugins/keyfile/nms-keyfile-storage.h \ - src/settings/plugins/keyfile/nms-keyfile-plugin.c \ - src/settings/plugins/keyfile/nms-keyfile-plugin.h \ - src/settings/plugins/keyfile/nms-keyfile-reader.c \ - src/settings/plugins/keyfile/nms-keyfile-reader.h \ - src/settings/plugins/keyfile/nms-keyfile-utils.c \ - src/settings/plugins/keyfile/nms-keyfile-utils.h \ - src/settings/plugins/keyfile/nms-keyfile-writer.c \ - src/settings/plugins/keyfile/nms-keyfile-writer.h \ + src/core/settings/plugins/keyfile/nms-keyfile-storage.c \ + src/core/settings/plugins/keyfile/nms-keyfile-storage.h \ + src/core/settings/plugins/keyfile/nms-keyfile-plugin.c \ + src/core/settings/plugins/keyfile/nms-keyfile-plugin.h \ + src/core/settings/plugins/keyfile/nms-keyfile-reader.c \ + src/core/settings/plugins/keyfile/nms-keyfile-reader.h \ + src/core/settings/plugins/keyfile/nms-keyfile-utils.c \ + src/core/settings/plugins/keyfile/nms-keyfile-utils.h \ + src/core/settings/plugins/keyfile/nms-keyfile-writer.c \ + src/core/settings/plugins/keyfile/nms-keyfile-writer.h \ \ - src/supplicant/nm-supplicant-config.c \ - src/supplicant/nm-supplicant-config.h \ - src/supplicant/nm-supplicant-interface.c \ - src/supplicant/nm-supplicant-interface.h \ - src/supplicant/nm-supplicant-manager.c \ - src/supplicant/nm-supplicant-manager.h \ - src/supplicant/nm-supplicant-settings-verify.c \ - src/supplicant/nm-supplicant-settings-verify.h \ - src/supplicant/nm-supplicant-types.h \ + src/core/supplicant/nm-supplicant-config.c \ + src/core/supplicant/nm-supplicant-config.h \ + src/core/supplicant/nm-supplicant-interface.c \ + src/core/supplicant/nm-supplicant-interface.h \ + src/core/supplicant/nm-supplicant-manager.c \ + src/core/supplicant/nm-supplicant-manager.h \ + src/core/supplicant/nm-supplicant-settings-verify.c \ + src/core/supplicant/nm-supplicant-settings-verify.h \ + src/core/supplicant/nm-supplicant-types.h \ \ - src/vpn/nm-vpn-connection.c \ - src/vpn/nm-vpn-connection.h \ - src/vpn/nm-vpn-manager.c \ - src/vpn/nm-vpn-manager.h \ + src/core/vpn/nm-vpn-connection.c \ + src/core/vpn/nm-vpn-connection.h \ + src/core/vpn/nm-vpn-manager.c \ + src/core/vpn/nm-vpn-manager.h \ \ - src/nm-act-request.c \ - src/nm-act-request.h \ - src/nm-active-connection.c \ - src/nm-active-connection.h \ - src/nm-audit-manager.c \ - src/nm-audit-manager.h \ - src/nm-dbus-manager.c \ - src/nm-dbus-manager.h \ - src/nm-config.c \ - src/nm-config.h \ - src/nm-config-data.c \ - src/nm-config-data.h \ - src/nm-connectivity.c \ - src/nm-connectivity.h \ - src/nm-dcb.c \ - src/nm-dcb.h \ - src/nm-dhcp-config.c \ - src/nm-dhcp-config.h \ - src/nm-dispatcher.c \ - src/nm-dispatcher.h \ - src/nm-firewall-manager.c \ - src/nm-firewall-manager.h \ - src/nm-proxy-config.c \ - src/nm-proxy-config.h \ - src/nm-auth-manager.c \ - src/nm-auth-manager.h \ - src/nm-auth-utils.c \ - src/nm-auth-utils.h \ - src/nm-manager.c \ - src/nm-manager.h \ - src/nm-pacrunner-manager.c \ - src/nm-pacrunner-manager.h \ - src/nm-policy.c \ - src/nm-policy.h \ - src/nm-rfkill-manager.c \ - src/nm-rfkill-manager.h \ - src/nm-session-monitor.h \ - src/nm-session-monitor.c \ - src/nm-keep-alive.c \ - src/nm-keep-alive.h \ - src/nm-sleep-monitor.c \ - src/nm-sleep-monitor.h \ - src/nm-types.h \ + src/core/nm-act-request.c \ + src/core/nm-act-request.h \ + src/core/nm-active-connection.c \ + src/core/nm-active-connection.h \ + src/core/nm-audit-manager.c \ + src/core/nm-audit-manager.h \ + src/core/nm-dbus-manager.c \ + src/core/nm-dbus-manager.h \ + src/core/nm-config.c \ + src/core/nm-config.h \ + src/core/nm-config-data.c \ + src/core/nm-config-data.h \ + src/core/nm-connectivity.c \ + src/core/nm-connectivity.h \ + src/core/nm-dcb.c \ + src/core/nm-dcb.h \ + src/core/nm-dhcp-config.c \ + src/core/nm-dhcp-config.h \ + src/core/nm-dispatcher.c \ + src/core/nm-dispatcher.h \ + src/core/nm-firewall-manager.c \ + src/core/nm-firewall-manager.h \ + src/core/nm-proxy-config.c \ + src/core/nm-proxy-config.h \ + src/core/nm-auth-manager.c \ + src/core/nm-auth-manager.h \ + src/core/nm-auth-utils.c \ + src/core/nm-auth-utils.h \ + src/core/nm-manager.c \ + src/core/nm-manager.h \ + src/core/nm-pacrunner-manager.c \ + src/core/nm-pacrunner-manager.h \ + src/core/nm-policy.c \ + src/core/nm-policy.h \ + src/core/nm-rfkill-manager.c \ + src/core/nm-rfkill-manager.h \ + src/core/nm-session-monitor.h \ + src/core/nm-session-monitor.c \ + src/core/nm-keep-alive.c \ + src/core/nm-keep-alive.h \ + src/core/nm-sleep-monitor.c \ + src/core/nm-sleep-monitor.h \ + src/core/nm-types.h \ \ $(NULL) -src_libNetworkManager_la_LIBADD = \ - src/libNetworkManagerBase.la \ +src_core_libNetworkManager_la_LIBADD = \ + src/core/libNetworkManagerBase.la \ libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/nm-keyfile/libnm-keyfile.la \ libnm-core/libnm-core.la \ @@ -2506,7 +2506,7 @@ src_libNetworkManager_la_LIBADD = \ shared/nm-udev-aux/libnm-udev-aux.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ - src/libnm-systemd-core.la \ + src/core/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/libnacd.la \ shared/libndhcp4.la \ @@ -2524,91 +2524,91 @@ src_libNetworkManager_la_LIBADD = \ $(LIBCURL_LIBS) \ $(NULL) -$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -check_ltlibraries += src/libNetworkManagerTest.la +check_ltlibraries += src/core/libNetworkManagerTest.la -src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup -src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup +src_core_tests_cppflags_fake = $(src_core_cppflags_test) -DSETUP=nm_fake_platform_setup +src_core_tests_cppflags_linux = $(src_core_cppflags_test) -DSETUP=nm_linux_platform_setup -src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test) +src_core_libNetworkManagerTest_la_CPPFLAGS = $(src_core_cppflags_test) -src_libNetworkManagerTest_la_SOURCES = \ - src/ndisc/nm-fake-ndisc.c \ - src/ndisc/nm-fake-ndisc.h \ - src/platform/nm-fake-platform.c \ - src/platform/nm-fake-platform.h \ - src/platform/tests/test-common.c \ - src/platform/tests/test-common.h \ +src_core_libNetworkManagerTest_la_SOURCES = \ + src/core/ndisc/nm-fake-ndisc.c \ + src/core/ndisc/nm-fake-ndisc.h \ + src/core/platform/nm-fake-platform.c \ + src/core/platform/nm-fake-platform.h \ + src/core/platform/tests/test-common.c \ + src/core/platform/tests/test-common.h \ $(NULL) -src_libNetworkManagerTest_la_LIBADD = \ - src/libNetworkManager.la \ +src_core_libNetworkManagerTest_la_LIBADD = \ + src/core/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -noinst_PROGRAMS += src/NetworkManager-all-sym +noinst_PROGRAMS += src/core/NetworkManager-all-sym -src_NetworkManager_all_sym_CPPFLAGS = $(src_cppflags) +src_core_NetworkManager_all_sym_CPPFLAGS = $(src_core_cppflags) -src_NetworkManager_all_sym_SOURCES = \ - src/main.c +src_core_NetworkManager_all_sym_SOURCES = \ + src/core/main.c -src_NetworkManager_all_sym_LDADD = \ - src/libNetworkManager.la \ +src_core_NetworkManager_all_sym_LDADD = \ + src/core/libNetworkManager.la \ $(GLIB_LIBS) \ $(NULL) -src_NetworkManager_all_sym_LDFLAGS = \ +src_core_NetworkManager_all_sym_LDFLAGS = \ -rdynamic \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(src_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -src/NetworkManager.ver: src/NetworkManager-all-sym $(core_plugins) +src/core/NetworkManager.ver: src/core/NetworkManager-all-sym $(core_plugins) $(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)" -CLEANFILES += src/NetworkManager.ver +CLEANFILES += src/core/NetworkManager.ver -EXTRA_src_NetworkManager_DEPENDENCIES = \ - src/NetworkManager.ver +EXTRA_src_core_NetworkManager_DEPENDENCIES = \ + src/core/NetworkManager.ver -src_NetworkManager_CPPFLAGS = $(src_cppflags) +src_core_NetworkManager_CPPFLAGS = $(src_core_cppflags) -src_NetworkManager_SOURCES = \ - src/main.c +src_core_NetworkManager_SOURCES = \ + src/core/main.c -src_NetworkManager_LDADD = \ - src/libNetworkManager.la \ +src_core_NetworkManager_LDADD = \ + src/core/libNetworkManager.la \ $(GLIB_LIBS) \ $(NULL) -src_NetworkManager_LDFLAGS = \ +src_core_NetworkManager_LDFLAGS = \ -rdynamic \ - -Wl,--version-script="src/NetworkManager.ver" \ + -Wl,--version-script="src/core/NetworkManager.ver" \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -src_nm_iface_helper_CPPFLAGS = $(src_cppflags) +src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags) -src_nm_iface_helper_SOURCES = \ - src/nm-iface-helper.c +src_core_nm_iface_helper_SOURCES = \ + src/core/nm-iface-helper.c -src_nm_iface_helper_LDADD = \ - src/libNetworkManagerBase.la \ +src_core_nm_iface_helper_LDADD = \ + src/core/libNetworkManagerBase.la \ libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/nm-keyfile/libnm-keyfile.la \ libnm-core/libnm-core.la \ @@ -2620,7 +2620,7 @@ src_nm_iface_helper_LDADD = \ shared/nm-udev-aux/libnm-udev-aux.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ - src/libnm-systemd-core.la \ + src/core/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/libnacd.la \ shared/libndhcp4.la \ @@ -2633,37 +2633,37 @@ src_nm_iface_helper_LDADD = \ $(DL_LIBS) \ $(NULL) -src_nm_iface_helper_LDFLAGS = \ +src_core_nm_iface_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) -$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -noinst_LTLIBRARIES += src/initrd/libnmi-core.la +noinst_LTLIBRARIES += src/core/initrd/libnmi-core.la -src_initrd_libnmi_core_la_CPPFLAGS = \ - $(src_cppflags) +src_core_initrd_libnmi_core_la_CPPFLAGS = \ + $(src_core_cppflags) -src_initrd_libnmi_core_la_SOURCES = \ - src/initrd/nm-initrd-generator.h \ - src/initrd/nmi-cmdline-reader.c \ - src/initrd/nmi-dt-reader.c \ - src/initrd/nmi-ibft-reader.c \ +src_core_initrd_libnmi_core_la_SOURCES = \ + src/core/initrd/nm-initrd-generator.h \ + src/core/initrd/nmi-cmdline-reader.c \ + src/core/initrd/nmi-dt-reader.c \ + src/core/initrd/nmi-ibft-reader.c \ $(NULL) -libexec_PROGRAMS += src/initrd/nm-initrd-generator +libexec_PROGRAMS += src/core/initrd/nm-initrd-generator -src_initrd_nm_initrd_generator_CPPFLAGS = \ - $(src_cppflags) +src_core_initrd_nm_initrd_generator_CPPFLAGS = \ + $(src_core_cppflags) -src_initrd_nm_initrd_generator_SOURCES = \ - src/initrd/nm-initrd-generator.c +src_core_initrd_nm_initrd_generator_SOURCES = \ + src/core/initrd/nm-initrd-generator.c -src_initrd_nm_initrd_generator_LDADD = \ - src/initrd/libnmi-core.la \ - src/libNetworkManagerBase.la \ +src_core_initrd_nm_initrd_generator_LDADD = \ + src/core/initrd/libnmi-core.la \ + src/core/libNetworkManagerBase.la \ libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/nm-keyfile/libnm-keyfile.la \ libnm-core/libnm-core.la \ @@ -2684,44 +2684,44 @@ src_initrd_nm_initrd_generator_LDADD = \ $(GLIB_LIBS) \ $(NULL) -src_initrd_nm_initrd_generator_LDFLAGS = \ +src_core_initrd_nm_initrd_generator_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) -check_programs += src/initrd/tests/test-dt-reader +check_programs += src/core/initrd/tests/test-dt-reader -src_initrd_tests_test_dt_reader_CPPFLAGS = \ +src_core_initrd_tests_test_dt_reader_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION_TEST \ - -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \ - $(src_cppflags) + -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \ + $(src_core_cppflags) -src_initrd_tests_test_dt_reader_LDFLAGS = \ +src_core_initrd_tests_test_dt_reader_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_initrd_tests_test_dt_reader_LDADD = \ - src/initrd/libnmi-core.la \ - src/libNetworkManagerTest.la \ +src_core_initrd_tests_test_dt_reader_LDADD = \ + src/core/initrd/libnmi-core.la \ + src/core/libNetworkManagerTest.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) -check_programs += src/initrd/tests/test-ibft-reader +check_programs += src/core/initrd/tests/test-ibft-reader -src_initrd_tests_test_ibft_reader_CPPFLAGS = \ +src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION_TEST \ - -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \ - $(src_cppflags) + -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \ + $(src_core_cppflags) -src_initrd_tests_test_ibft_reader_LDFLAGS = \ +src_core_initrd_tests_test_ibft_reader_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_initrd_tests_test_ibft_reader_LDADD = \ - src/initrd/libnmi-core.la \ - src/libNetworkManagerTest.la \ +src_core_initrd_tests_test_ibft_reader_LDADD = \ + src/core/initrd/libnmi-core.la \ + src/core/libNetworkManagerTest.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ @@ -2729,261 +2729,261 @@ src_initrd_tests_test_ibft_reader_LDADD = \ $(NULL) EXTRA_DIST += \ - src/initrd/meson.build \ - src/initrd/tests/meson.build \ - src/initrd/tests/sysfs/class/net/eth0/address \ - src/initrd/tests/sysfs/class/net/eth2/address \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \ - src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \ - src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \ - src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \ - src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \ - src/initrd/tests/sysfs/firmware/ibft/initiator/index \ - src/initrd/tests/sysfs/firmware/ibft/initiator/flags \ - src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \ - src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs/firmware/ibft/target0/chap-type \ - src/initrd/tests/sysfs/firmware/ibft/target0/index \ - src/initrd/tests/sysfs/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs/firmware/ibft/target0/flags \ - src/initrd/tests/sysfs/firmware/ibft/target0/port \ - src/initrd/tests/sysfs/firmware/ibft/target2/target-name \ - src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \ - src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \ - src/initrd/tests/sysfs/firmware/ibft/target2/chap-type \ - src/initrd/tests/sysfs/firmware/ibft/target2/index \ - src/initrd/tests/sysfs/firmware/ibft/target2/lun \ - src/initrd/tests/sysfs/firmware/ibft/target2/flags \ - src/initrd/tests/sysfs/firmware/ibft/target2/port \ - src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \ - src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \ - src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/index \ - src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \ - src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-dhcp/class/net/eth0/address \ - src/initrd/tests/sysfs-dhcp/class/net/eth1/address \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \ - src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \ - src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \ - src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \ - src/initrd/tests/sysfs-static/class/net/eth0/address \ - src/initrd/tests/sysfs-static/class/net/eth1/address \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-static/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-static/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-static/firmware/ibft/target0/port \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \ - src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \ - src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \ - src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \ - src/initrd/tests/sysfs-static/firmware/ibft/target1/index \ - src/initrd/tests/sysfs-static/firmware/ibft/target1/lun \ - src/initrd/tests/sysfs-static/firmware/ibft/target1/port \ - src/initrd/tests/sysfs-vlan/class/net/eth0/address \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \ - src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \ - src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \ - src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \ - src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \ - src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \ - src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \ - src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \ + src/core/initrd/meson.build \ + src/core/initrd/tests/meson.build \ + src/core/initrd/tests/sysfs/class/net/eth0/address \ + src/core/initrd/tests/sysfs/class/net/eth2/address \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/index \ + src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/flags \ + src/core/initrd/tests/sysfs/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/index \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/lun \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/flags \ + src/core/initrd/tests/sysfs/firmware/ibft/target2/port \ + src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \ + src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \ + src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index \ + src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \ + src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address \ + src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \ + src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \ + src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \ + src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \ + src/core/initrd/tests/sysfs-static/class/net/eth0/address \ + src/core/initrd/tests/sysfs-static/class/net/eth1/address \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \ + src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun \ + src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port \ + src/core/initrd/tests/sysfs-vlan/class/net/eth0/address \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \ + src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \ $(NULL) -check_programs += src/initrd/tests/test-cmdline-reader +check_programs += src/core/initrd/tests/test-cmdline-reader -src_initrd_tests_test_cmdline_reader_CPPFLAGS = \ +src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION_TEST \ - -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \ - $(src_cppflags) + -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/core/initrd/tests\" \ + $(src_core_cppflags) -src_initrd_tests_test_cmdline_reader_LDFLAGS = \ +src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_initrd_tests_test_cmdline_reader_LDADD = \ - src/initrd/libnmi-core.la \ - src/libNetworkManagerTest.la \ +src_core_initrd_tests_test_cmdline_reader_LDADD = \ + src/core/initrd/libnmi-core.la \ + src/core/libNetworkManagerTest.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) -$(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### EXTRA_DIST += \ - src/org.freedesktop.NetworkManager.conf \ - src/nm-test-utils-core.h \ - src/meson.build + src/core/org.freedesktop.NetworkManager.conf \ + src/core/nm-test-utils-core.h \ + src/core/meson.build ############################################################################### -# src/dhcp +# src/core/dhcp ############################################################################### -libexec_PROGRAMS += src/dhcp/nm-dhcp-helper +libexec_PROGRAMS += src/core/dhcp/nm-dhcp-helper -src_dhcp_nm_dhcp_helper_CPPFLAGS = \ +src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ @@ -2992,60 +2992,60 @@ src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(NULL) -src_dhcp_nm_dhcp_helper_SOURCES = \ - src/dhcp/nm-dhcp-helper.c \ - src/dhcp/nm-dhcp-helper-api.h \ +src_core_dhcp_nm_dhcp_helper_SOURCES = \ + src/core/dhcp/nm-dhcp-helper.c \ + src/core/dhcp/nm-dhcp-helper-api.h \ $(NULL) -src_dhcp_nm_dhcp_helper_LDFLAGS = \ +src_core_dhcp_nm_dhcp_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" -src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) +src_core_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) EXTRA_DIST += \ - src/dhcp/meson.build + src/core/dhcp/meson.build ############################################################################### -# src/dhcp/tests +# src/core/dhcp/tests ############################################################################### -src_dhcp_tests_cppflags = $(src_cppflags_test) +src_core_dhcp_tests_cppflags = $(src_core_cppflags_test) -src_dhcp_tests_ldadd = \ - src/libNetworkManagerTest.la +src_core_dhcp_tests_ldadd = \ + src/core/libNetworkManagerTest.la check_programs += \ - src/dhcp/tests/test-dhcp-dhclient \ - src/dhcp/tests/test-dhcp-utils + src/core/dhcp/tests/test-dhcp-dhclient \ + src/core/dhcp/tests/test-dhcp-utils -src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags) -src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) +src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_core_dhcp_tests_cppflags) +src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_core_dhcp_tests_cppflags) -src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) +src_core_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_core_dhcp_tests_ldadd) +src_core_dhcp_tests_test_dhcp_utils_LDADD = $(src_core_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags) -src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) +src_core_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_core_tests_ldflags) +src_core_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_core_tests_ldflags) -$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/dhcp/tests/test-dhclient-duid.leases \ - src/dhcp/tests/test-dhclient-commented-duid.leases \ - src/dhcp/tests/meson.build + src/core/dhcp/tests/test-dhclient-duid.leases \ + src/core/dhcp/tests/test-dhclient-commented-duid.leases \ + src/core/dhcp/tests/meson.build ############################################################################### -# src/ppp +# src/core/ppp ############################################################################### if WITH_PPP -core_plugins += src/ppp/libnm-ppp-plugin.la +core_plugins += src/core/ppp/libnm-ppp-plugin.la -pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la +pppd_plugin_LTLIBRARIES += src/core/ppp/nm-pppd-plugin.la -src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ +src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ @@ -3054,217 +3054,217 @@ src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ $(GLIB_CFLAGS) -src_ppp_nm_pppd_plugin_la_SOURCES = \ - src/ppp/nm-pppd-plugin.c \ - src/ppp/nm-pppd-plugin.h \ - src/ppp/nm-ppp-status.h +src_core_ppp_nm_pppd_plugin_la_SOURCES = \ + src/core/ppp/nm-pppd-plugin.c \ + src/core/ppp/nm-pppd-plugin.h \ + src/core/ppp/nm-ppp-status.h -src_ppp_nm_pppd_plugin_la_LDFLAGS = \ +src_core_ppp_nm_pppd_plugin_la_LDFLAGS = \ -module -avoid-version -src_ppp_nm_pppd_plugin_la_LIBADD = \ +src_core_ppp_nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(DL_LIBS) \ $(NULL) -$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -src_ppp_libnm_ppp_plugin_la_SOURCES = \ - src/ppp/nm-pppd-plugin.h \ - src/ppp/nm-ppp-manager.c \ - src/ppp/nm-ppp-manager.h \ - src/ppp/nm-ppp-plugin-api.h \ - src/ppp/nm-ppp-status.h \ +src_core_ppp_libnm_ppp_plugin_la_SOURCES = \ + src/core/ppp/nm-pppd-plugin.h \ + src/core/ppp/nm-ppp-manager.c \ + src/core/ppp/nm-ppp-manager.h \ + src/core/ppp/nm-ppp-plugin-api.h \ + src/core/ppp/nm-ppp-status.h \ $(NULL) -EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ - src/ppp/nm-ppp-plugin.ver \ +EXTRA_src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ + src/core/ppp/nm-ppp-plugin.ver \ $(NULL) -src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base) +src_core_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_core_cppflags_base) -src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ +src_core_ppp_libnm_ppp_plugin_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" \ + -Wl,--version-script="$(srcdir)/src/core/ppp/nm-ppp-plugin.ver" \ $(NULL) -src_ppp_libnm_ppp_plugin_la_LIBADD = \ +src_core_ppp_libnm_ppp_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) -$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif EXTRA_DIST += \ - src/ppp/meson.build + src/core/ppp/meson.build ############################################################################### -# src/settings/plugins/keyfile/tests +# src/core/settings/plugins/keyfile/tests ############################################################################### -check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings +check_programs += src/core/settings/plugins/keyfile/tests/test-keyfile-settings -src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test) +src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_core_cppflags_test) -src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \ +src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \ - src/libNetworkManagerTest.la +src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \ + src/core/libNetworkManagerTest.la -$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ - src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \ - src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \ - src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \ - src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \ - src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \ - src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \ - src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \ - src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \ - src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \ - src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \ - src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \ - src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \ + src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \ + src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \ + src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ \ - src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ - src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ + src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ + src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ \ - src/settings/plugins/keyfile/tests/meson.build + src/core/settings/plugins/keyfile/tests/meson.build ############################################################################### -# src/settings/plugins/ifcfg-rh +# src/core/settings/plugins/ifcfg-rh ############################################################################### if CONFIG_PLUGIN_IFCFG_RH -core_plugins += src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la +core_plugins += src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la noinst_LTLIBRARIES += \ - src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ - src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la + src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ + src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la ############################################################################### -nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \ - src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \ - src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h +nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \ + src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \ + src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h -src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \ - $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) \ +src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \ + $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_core_cppflags_base)) \ $(INTROSPECTION_EXTRA_CFLAGS) \ $(NULL) -CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) +CLEANFILES += $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml - @$(MKDIR_P) src/settings/plugins/ifcfg-rh/ +src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml + @$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/ $(AM_V_GEN) gdbus-codegen \ --generate-c-code $(basename $@) \ --c-namespace NMDBus \ --interface-prefix com.redhat \ $< -src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h +src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h @true ############################################################################### -src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \ - src/settings/plugins/ifcfg-rh/shvar.c \ - src/settings/plugins/ifcfg-rh/shvar.h \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \ +src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \ + src/core/settings/plugins/ifcfg-rh/shvar.c \ + src/core/settings/plugins/ifcfg-rh/shvar.h \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \ $(NULL) -src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base) +src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_core_cppflags_base) -$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \ +src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \ + src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \ $(NULL) -src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base) +src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_core_cppflags_base) -src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ +src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ $(SANITIZER_EXEC_LDFLAGS) -src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ - src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la +src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ + src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h -$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h +$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) +check-local-symbols-settings-ifcfg-rh: src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la + $(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) check_local += check-local-symbols-settings-ifcfg-rh ############################################################################### -# src/settings/plugins/ifcfg-rh/tests +# src/core/settings/plugins/ifcfg-rh/tests ############################################################################### -check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +check_programs += src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh -src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ - src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ + src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c -src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test) +src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_core_cppflags_base_test) -src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ +src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ - src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ - src/libNetworkManagerTest.la +src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ + src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ + src/core/libNetworkManagerTest.la -$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) dist_libexec_SCRIPTS += \ - src/settings/plugins/ifcfg-rh/nm-ifup \ - src/settings/plugins/ifcfg-rh/nm-ifdown + src/core/settings/plugins/ifcfg-rh/nm-ifup \ + src/core/settings/plugins/ifcfg-rh/nm-ifdown install-data-hook-ifcfg-rh: $(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts @@ -3274,229 +3274,229 @@ install_data_hook += install-data-hook-ifcfg-rh endif EXTRA_DIST += \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \ $(NULL) # make target dependencies can't have colons in their names, which ends up # meaning that we can't add the alias files to EXTRA_DIST. They are instead # dist'ed via dist-hook-settings-ifcfg-rh below. -src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 +src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \ + src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 dist-hook-settings-ifcfg-rh-alias-files: - @for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ - cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \ + @for f in $(src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ + cp $(abs_srcdir)/$$f $(distdir)/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/; \ done dist_hook += dist-hook-settings-ifcfg-rh-alias-files @@ -3504,473 +3504,473 @@ dist_hook += dist-hook-settings-ifcfg-rh-alias-files ############################################################################### if CONFIG_PLUGIN_IFCFG_RH -dbusservice_DATA += src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +dbusservice_DATA += src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf endif EXTRA_DIST += \ - src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ - src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ - src/settings/plugins/ifcfg-rh/meson.build \ - src/settings/plugins/ifcfg-rh/tests/meson.build + src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ + src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ + src/core/settings/plugins/ifcfg-rh/meson.build \ + src/core/settings/plugins/ifcfg-rh/tests/meson.build ############################################################################### -# src/settings/plugins/ifupdown +# src/core/settings/plugins/ifupdown ############################################################################### if CONFIG_PLUGIN_IFUPDOWN -core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la +core_plugins += src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la +noinst_LTLIBRARIES += src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la -src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \ - src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \ - src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \ - src/settings/plugins/ifupdown/nms-ifupdown-parser.c \ - src/settings/plugins/ifupdown/nms-ifupdown-parser.h \ +src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \ + src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \ + src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \ + src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c \ + src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h \ $(NULL) -src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base) +src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_core_cppflags_base) -src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ +src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(NULL) -src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ - src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \ - src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \ +src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ + src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c \ + src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h \ $(NULL) -src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base) +src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_core_cppflags_base) -src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \ +src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ $(NULL) -src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ - src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ +src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ + src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \ $(LIBUDEV_LIBS) \ $(NULL) -$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) +check-local-symbols-settings-ifupdown: src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la + $(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) check_local += check-local-symbols-settings-ifupdown ############################################################################### -check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown +check_programs += src/core/settings/plugins/ifupdown/tests/test-ifupdown -src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test) +src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_core_cppflags_base_test) -src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ +src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ - src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ - src/libNetworkManagerTest.la \ +src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ + src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \ + src/core/libNetworkManagerTest.la \ $(GLIB_LIBS) \ $(NULL) -$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif EXTRA_DIST += \ - src/settings/plugins/ifupdown/tests/test1 \ - src/settings/plugins/ifupdown/tests/test2 \ - src/settings/plugins/ifupdown/tests/test3 \ - src/settings/plugins/ifupdown/tests/test4 \ - src/settings/plugins/ifupdown/tests/test5 \ - src/settings/plugins/ifupdown/tests/test6 \ - src/settings/plugins/ifupdown/tests/test7 \ - src/settings/plugins/ifupdown/tests/test8 \ - src/settings/plugins/ifupdown/tests/test9 \ - src/settings/plugins/ifupdown/tests/test11 \ - src/settings/plugins/ifupdown/tests/test12 \ - src/settings/plugins/ifupdown/tests/test13 \ - src/settings/plugins/ifupdown/tests/test14 \ - src/settings/plugins/ifupdown/tests/test15 \ - src/settings/plugins/ifupdown/tests/test16 \ - src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \ - src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \ - src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \ - src/settings/plugins/ifupdown/tests/test20-source-stanza \ - src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \ - src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ - src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ - src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ - src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \ - src/settings/plugins/ifupdown/meson.build \ - src/settings/plugins/ifupdown/tests/meson.build + src/core/settings/plugins/ifupdown/tests/test1 \ + src/core/settings/plugins/ifupdown/tests/test2 \ + src/core/settings/plugins/ifupdown/tests/test3 \ + src/core/settings/plugins/ifupdown/tests/test4 \ + src/core/settings/plugins/ifupdown/tests/test5 \ + src/core/settings/plugins/ifupdown/tests/test6 \ + src/core/settings/plugins/ifupdown/tests/test7 \ + src/core/settings/plugins/ifupdown/tests/test8 \ + src/core/settings/plugins/ifupdown/tests/test9 \ + src/core/settings/plugins/ifupdown/tests/test11 \ + src/core/settings/plugins/ifupdown/tests/test12 \ + src/core/settings/plugins/ifupdown/tests/test13 \ + src/core/settings/plugins/ifupdown/tests/test14 \ + src/core/settings/plugins/ifupdown/tests/test15 \ + src/core/settings/plugins/ifupdown/tests/test16 \ + src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \ + src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \ + src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \ + src/core/settings/plugins/ifupdown/tests/test20-source-stanza \ + src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \ + src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ + src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ + src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ + src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \ + src/core/settings/plugins/ifupdown/meson.build \ + src/core/settings/plugins/ifupdown/tests/meson.build ############################################################################### -# src/devices +# src/core/devices ############################################################################### EXTRA_DIST += \ - src/devices/meson.build + src/core/devices/meson.build ############################################################################### -# src/devices/adsl +# src/core/devices/adsl ############################################################################### -core_plugins += src/devices/adsl/libnm-device-plugin-adsl.la +core_plugins += src/core/devices/adsl/libnm-device-plugin-adsl.la -src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ - src/devices/adsl/nm-atm-manager.c \ - src/devices/adsl/nm-device-adsl.c \ - src/devices/adsl/nm-device-adsl.h +src_core_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ + src/core/devices/adsl/nm-atm-manager.c \ + src/core/devices/adsl/nm-device-adsl.c \ + src/core/devices/adsl/nm-device-adsl.h -src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin) +src_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_core_cppflags_device_plugin) -src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ +src_core_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" -src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ +src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ $(LIBUDEV_LIBS) -check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) +check-local-devices-adsl: src/core/devices/adsl/libnm-device-plugin-adsl.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so) check_local += check-local-devices-adsl EXTRA_DIST += \ - src/devices/adsl/meson.build + src/core/devices/adsl/meson.build ############################################################################### -# src/devices/wwan +# src/core/devices/wwan ############################################################################### if WITH_MODEM_MANAGER_1 -src_devices_wwan_cppflags = \ - $(src_cppflags_device_plugin) \ +src_core_devices_wwan_cppflags = \ + $(src_core_cppflags_device_plugin) \ $(MM_GLIB_CFLAGS) \ $(NULL) -core_plugins += src/devices/wwan/libnm-wwan.la +core_plugins += src/core/devices/wwan/libnm-wwan.la -src_devices_wwan_libnm_wwan_la_SOURCES = \ - src/devices/wwan/nm-modem-broadband.c \ - src/devices/wwan/nm-modem-broadband.h \ - src/devices/wwan/nm-modem-manager.c \ - src/devices/wwan/nm-modem-manager.h \ - src/devices/wwan/nm-modem.c \ - src/devices/wwan/nm-modem.h \ - src/devices/wwan/nm-service-providers.c \ - src/devices/wwan/nm-service-providers.h \ +src_core_devices_wwan_libnm_wwan_la_SOURCES = \ + src/core/devices/wwan/nm-modem-broadband.c \ + src/core/devices/wwan/nm-modem-broadband.h \ + src/core/devices/wwan/nm-modem-manager.c \ + src/core/devices/wwan/nm-modem-manager.h \ + src/core/devices/wwan/nm-modem.c \ + src/core/devices/wwan/nm-modem.h \ + src/core/devices/wwan/nm-service-providers.c \ + src/core/devices/wwan/nm-service-providers.h \ $(NULL) if WITH_OFONO -src_devices_wwan_libnm_wwan_la_SOURCES += \ - src/devices/wwan/nm-modem-ofono.c \ - src/devices/wwan/nm-modem-ofono.h +src_core_devices_wwan_libnm_wwan_la_SOURCES += \ + src/core/devices/wwan/nm-modem-ofono.c \ + src/core/devices/wwan/nm-modem-ofono.h endif -src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) +src_core_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags) -src_devices_wwan_libnm_wwan_la_LDFLAGS = \ +src_core_devices_wwan_libnm_wwan_la_LDFLAGS = \ -avoid-version \ - -Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver" + -Wl,--version-script="$(srcdir)/src/core/devices/wwan/libnm-wwan.ver" -src_devices_wwan_libnm_wwan_la_LIBADD = \ +src_core_devices_wwan_libnm_wwan_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBSYSTEMD_LIBS) \ $(MM_GLIB_LIBS) -$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \ - src/devices/wwan/libnm-wwan.ver +EXTRA_src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES = \ + src/core/devices/wwan/libnm-wwan.ver -core_plugins += src/devices/wwan/libnm-device-plugin-wwan.la +core_plugins += src/core/devices/wwan/libnm-device-plugin-wwan.la -src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \ - src/devices/wwan/nm-wwan-factory.c \ - src/devices/wwan/nm-device-modem.c \ - src/devices/wwan/nm-device-modem.h +src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \ + src/core/devices/wwan/nm-wwan-factory.c \ + src/core/devices/wwan/nm-device-modem.c \ + src/core/devices/wwan/nm-device-modem.h -src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) +src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags) -src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \ +src_core_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" -src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ - src/devices/wwan/libnm-wwan.la \ +src_core_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ + src/core/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) -check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so) - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver" - $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so) +check-local-devices-wwan: src/core/devices/wwan/libnm-device-plugin-wwan.la src/core/devices/wwan/libnm-wwan.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so) + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/core/devices/wwan/libnm-wwan.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so) check_local += check-local-devices-wwan -src_devices_wwan_tests_test_service_providers_SOURCES = \ - src/devices/wwan/tests/test-service-providers.c \ - src/devices/wwan/nm-service-providers.c \ - src/devices/wwan/nm-service-providers.h \ +src_core_devices_wwan_tests_test_service_providers_SOURCES = \ + src/core/devices/wwan/tests/test-service-providers.c \ + src/core/devices/wwan/nm-service-providers.c \ + src/core/devices/wwan/nm-service-providers.h \ $(NULL) -src_devices_wwan_tests_test_service_providers_CPPFLAGS = \ - $(src_cppflags_base_test) \ - -I$(srcdir)/src/devices/wwan \ +src_core_devices_wwan_tests_test_service_providers_CPPFLAGS = \ + $(src_core_cppflags_base_test) \ + -I$(srcdir)/src/core/devices/wwan \ $(NULL) -src_devices_wwan_tests_test_service_providers_LDFLAGS = \ +src_core_devices_wwan_tests_test_service_providers_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -src_devices_wwan_tests_test_service_providers_LDADD = \ - src/libNetworkManagerTest.la \ +src_core_devices_wwan_tests_test_service_providers_LDADD = \ + src/core/libNetworkManagerTest.la \ $(GLIB_LIBS) \ $(NULL) -check_programs += src/devices/wwan/tests/test-service-providers +check_programs += src/core/devices/wwan/tests/test-service-providers -$(src_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif EXTRA_DIST += \ - src/devices/wwan/libnm-wwan.ver \ - src/devices/wwan/meson.build \ - src/devices/wwan/tests/test-service-providers.xml \ + src/core/devices/wwan/libnm-wwan.ver \ + src/core/devices/wwan/meson.build \ + src/core/devices/wwan/tests/test-service-providers.xml \ $(NULL) ############################################################################### -# src/devices/bluetooth +# src/core/devices/bluetooth ############################################################################### if WITH_MODEM_MANAGER_1 -noinst_LTLIBRARIES += src/devices/bluetooth/libnm-bluetooth-utils.la +noinst_LTLIBRARIES += src/core/devices/bluetooth/libnm-bluetooth-utils.la -src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = \ - src/devices/bluetooth/nm-bluez-common.h \ - src/devices/bluetooth/nm-bt-error.c \ - src/devices/bluetooth/nm-bt-error.h \ +src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = \ + src/core/devices/bluetooth/nm-bluez-common.h \ + src/core/devices/bluetooth/nm-bt-error.c \ + src/core/devices/bluetooth/nm-bt-error.h \ $(NULL) -src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \ - $(src_cppflags_base) \ +src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \ + $(src_core_cppflags_base) \ $(NULL) -src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \ +src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \ $(GLIB_LIBS) \ $(NULL) if WITH_BLUEZ5_DUN -src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES += \ - src/devices/bluetooth/nm-bluez5-dun.c \ - src/devices/bluetooth/nm-bluez5-dun.h \ +src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES += \ + src/core/devices/bluetooth/nm-bluez5-dun.c \ + src/core/devices/bluetooth/nm-bluez5-dun.h \ $(NULL) -src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS) -src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS) +src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS) +src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS) endif -$(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -core_plugins += src/devices/bluetooth/libnm-device-plugin-bluetooth.la +core_plugins += src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la -src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ - src/devices/bluetooth/nm-bluez-manager.c \ - src/devices/bluetooth/nm-bluez-manager.h \ - src/devices/bluetooth/nm-device-bt.c \ - src/devices/bluetooth/nm-device-bt.h \ +src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ + src/core/devices/bluetooth/nm-bluez-manager.c \ + src/core/devices/bluetooth/nm-bluez-manager.h \ + src/core/devices/bluetooth/nm-device-bt.c \ + src/core/devices/bluetooth/nm-device-bt.h \ $(NULL) -src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin) +src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_core_cppflags_device_plugin) -src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ +src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" -src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ - src/devices/bluetooth/libnm-bluetooth-utils.la \ - src/devices/wwan/libnm-wwan.la \ +src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ + src/core/devices/bluetooth/libnm-bluetooth-utils.la \ + src/core/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) \ $(NULL) ############################################################################### check_programs_norun += \ - src/devices/bluetooth/tests/nm-bt-test + src/core/devices/bluetooth/tests/nm-bt-test -src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \ - $(src_cppflags_test) \ +src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \ + $(src_core_cppflags_test) \ $(NULL) -src_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \ +src_core_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -src_devices_bluetooth_tests_nm_bt_test_LDADD = \ - src/devices/bluetooth/libnm-bluetooth-utils.la \ - src/libNetworkManager.la \ +src_core_devices_bluetooth_tests_nm_bt_test_LDADD = \ + src/core/devices/bluetooth/libnm-bluetooth-utils.la \ + src/core/libNetworkManager.la \ $(GLIB_LIBS) \ $(NULL) -$(src_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### -check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so) +check-local-devices-bluetooth: src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so) check_local += check-local-devices-bluetooth endif EXTRA_DIST += \ - src/devices/bluetooth/meson.build \ + src/core/devices/bluetooth/meson.build \ $(NULL) ############################################################################### -# src/devices/wifi +# src/core/devices/wifi ############################################################################### if WITH_WIFI -noinst_LTLIBRARIES += src/devices/wifi/libnm-wifi-base.la +noinst_LTLIBRARIES += src/core/devices/wifi/libnm-wifi-base.la -src_devices_wifi_libnm_wifi_base_la_SOURCES = \ - src/devices/wifi/nm-device-olpc-mesh.c \ - src/devices/wifi/nm-device-olpc-mesh.h \ - src/devices/wifi/nm-device-wifi-p2p.c \ - src/devices/wifi/nm-device-wifi-p2p.h \ - src/devices/wifi/nm-device-wifi.c \ - src/devices/wifi/nm-device-wifi.h \ - src/devices/wifi/nm-wifi-ap.c \ - src/devices/wifi/nm-wifi-ap.h \ - src/devices/wifi/nm-wifi-common.c \ - src/devices/wifi/nm-wifi-common.h \ - src/devices/wifi/nm-wifi-p2p-peer.c \ - src/devices/wifi/nm-wifi-p2p-peer.h \ - src/devices/wifi/nm-wifi-utils.c \ - src/devices/wifi/nm-wifi-utils.h \ +src_core_devices_wifi_libnm_wifi_base_la_SOURCES = \ + src/core/devices/wifi/nm-device-olpc-mesh.c \ + src/core/devices/wifi/nm-device-olpc-mesh.h \ + src/core/devices/wifi/nm-device-wifi-p2p.c \ + src/core/devices/wifi/nm-device-wifi-p2p.h \ + src/core/devices/wifi/nm-device-wifi.c \ + src/core/devices/wifi/nm-device-wifi.h \ + src/core/devices/wifi/nm-wifi-ap.c \ + src/core/devices/wifi/nm-wifi-ap.h \ + src/core/devices/wifi/nm-wifi-common.c \ + src/core/devices/wifi/nm-wifi-common.h \ + src/core/devices/wifi/nm-wifi-p2p-peer.c \ + src/core/devices/wifi/nm-wifi-p2p-peer.h \ + src/core/devices/wifi/nm-wifi-utils.c \ + src/core/devices/wifi/nm-wifi-utils.h \ $(NULL) if WITH_IWD -src_devices_wifi_libnm_wifi_base_la_SOURCES += \ - src/devices/wifi/nm-device-iwd.c \ - src/devices/wifi/nm-device-iwd.h \ - src/devices/wifi/nm-iwd-manager.c \ - src/devices/wifi/nm-iwd-manager.h \ +src_core_devices_wifi_libnm_wifi_base_la_SOURCES += \ + src/core/devices/wifi/nm-device-iwd.c \ + src/core/devices/wifi/nm-device-iwd.h \ + src/core/devices/wifi/nm-iwd-manager.c \ + src/core/devices/wifi/nm-iwd-manager.h \ $(NULL) endif -src_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_cppflags_device_plugin) +src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_plugin) -src_devices_wifi_libnm_wifi_base_la_LIBADD = \ +src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \ $(GLIB_LIBS) -$(src_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -core_plugins += src/devices/wifi/libnm-device-plugin-wifi.la +core_plugins += src/core/devices/wifi/libnm-device-plugin-wifi.la -src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ - src/devices/wifi/nm-wifi-factory.c \ +src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ + src/core/devices/wifi/nm-wifi-factory.c \ $(NULL) -src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin) +src_core_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_core_cppflags_device_plugin) -src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ +src_core_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" -src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ - src/devices/wifi/libnm-wifi-base.la \ +src_core_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ + src/core/devices/wifi/libnm-wifi-base.la \ $(GLIB_LIBS) -check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so) +check-local-devices-wifi: src/core/devices/wifi/libnm-device-plugin-wifi.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so) check_local += check-local-devices-wifi -check_programs += src/devices/wifi/tests/test-devices-wifi +check_programs += src/core/devices/wifi/tests/test-devices-wifi -src_devices_wifi_tests_test_devices_wifi_SOURCES = \ - src/devices/wifi/tests/test-devices-wifi.c \ +src_core_devices_wifi_tests_test_devices_wifi_SOURCES = \ + src/core/devices/wifi/tests/test-devices-wifi.c \ $(NULL) -src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test) +src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_core_cppflags_base_test) -src_devices_wifi_tests_test_devices_wifi_LDADD = \ - src/devices/wifi/libnm-wifi-base.la \ - src/libNetworkManagerTest.la \ - src/libNetworkManagerBase.la \ +src_core_devices_wifi_tests_test_devices_wifi_LDADD = \ + src/core/devices/wifi/libnm-wifi-base.la \ + src/core/libNetworkManagerTest.la \ + src/core/libNetworkManagerBase.la \ $(NULL) -src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) +src_core_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) -$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif EXTRA_DIST += \ - src/devices/wifi/meson.build \ + src/core/devices/wifi/meson.build \ $(NULL) ############################################################################### -# src/devices/team +# src/core/devices/team ############################################################################### if WITH_TEAMDCTL -core_plugins += src/devices/team/libnm-device-plugin-team.la +core_plugins += src/core/devices/team/libnm-device-plugin-team.la -src_devices_team_libnm_device_plugin_team_la_SOURCES = \ - src/devices/team/nm-team-factory.c \ - src/devices/team/nm-device-team.c \ - src/devices/team/nm-device-team.h \ +src_core_devices_team_libnm_device_plugin_team_la_SOURCES = \ + src/core/devices/team/nm-team-factory.c \ + src/core/devices/team/nm-device-team.c \ + src/core/devices/team/nm-device-team.h \ $(NULL) -src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ - $(src_cppflags_device_plugin) \ +src_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ + $(src_core_cppflags_device_plugin) \ $(LIBTEAMDCTL_CFLAGS) \ $(JANSSON_CFLAGS) \ $(NULL) -src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ +src_core_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" \ $(NULL) -src_devices_team_libnm_device_plugin_team_la_LIBADD = \ +src_core_devices_team_libnm_device_plugin_team_la_LIBADD = \ $(LIBTEAMDCTL_LIBS) \ $(JANSSON_LIBS) \ $(GLIB_LIBS) \ $(NULL) -check-local-devices-team: src/devices/team/libnm-device-plugin-team.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so) +check-local-devices-team: src/core/devices/team/libnm-device-plugin-team.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so) check_local += check-local-devices-team endif EXTRA_DIST += \ - src/devices/team/meson.build + src/core/devices/team/meson.build ############################################################################### -# src/devices/ovs +# src/core/devices/ovs ############################################################################### if WITH_OPENVSWITCH @@ -3983,373 +3983,373 @@ systemdnmunit_DATA = \ endif -core_plugins += src/devices/ovs/libnm-device-plugin-ovs.la +core_plugins += src/core/devices/ovs/libnm-device-plugin-ovs.la -src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \ - src/devices/ovs/nm-ovsdb.c \ - src/devices/ovs/nm-ovsdb.h \ - src/devices/ovs/nm-ovs-factory.c \ - src/devices/ovs/nm-device-ovs-interface.c \ - src/devices/ovs/nm-device-ovs-interface.h \ - src/devices/ovs/nm-device-ovs-port.c \ - src/devices/ovs/nm-device-ovs-port.h \ - src/devices/ovs/nm-device-ovs-bridge.c \ - src/devices/ovs/nm-device-ovs-bridge.h \ +src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \ + src/core/devices/ovs/nm-ovsdb.c \ + src/core/devices/ovs/nm-ovsdb.h \ + src/core/devices/ovs/nm-ovs-factory.c \ + src/core/devices/ovs/nm-device-ovs-interface.c \ + src/core/devices/ovs/nm-device-ovs-interface.h \ + src/core/devices/ovs/nm-device-ovs-port.c \ + src/core/devices/ovs/nm-device-ovs-port.h \ + src/core/devices/ovs/nm-device-ovs-bridge.c \ + src/core/devices/ovs/nm-device-ovs-bridge.h \ $(NULL) -src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ - $(src_cppflags_device_plugin) \ +src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ + $(src_core_cppflags_device_plugin) \ $(JANSSON_CFLAGS) \ $(NULL) -src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ +src_core_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ -module -avoid-version \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" \ $(NULL) -src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ +src_core_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ $(JANSSON_LIBS) \ $(GLIB_LIBS) \ $(NULL) -check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so) +check-local-devices-ovs: src/core/devices/ovs/libnm-device-plugin-ovs.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so) endif EXTRA_DIST += \ data/NetworkManager-ovs.conf \ - src/devices/ovs/meson.build + src/core/devices/ovs/meson.build ############################################################################### -# src/dnsmasq/tests +# src/core/dnsmasq/tests ############################################################################### -check_programs += src/dnsmasq/tests/test-dnsmasq-utils +check_programs += src/core/dnsmasq/tests/test-dnsmasq-utils -src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test) +src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_core_cppflags_test) -src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ - src/libNetworkManagerTest.la +src_core_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ + src/core/libNetworkManagerTest.la -src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ +src_core_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/dnsmasq/tests/meson.build + src/core/dnsmasq/tests/meson.build ############################################################################### -# src/platform/tests +# src/core/platform/tests ############################################################################### -src_platform_tests_ldflags = \ +src_core_platform_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_platform_tests_libadd = \ - src/libNetworkManagerTest.la \ +src_core_platform_tests_libadd = \ + src/core/libNetworkManagerTest.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) check_programs_norun += \ - src/platform/tests/monitor + src/core/platform/tests/monitor check_programs += \ - src/platform/tests/test-address-fake \ - src/platform/tests/test-address-linux \ - src/platform/tests/test-cleanup-fake \ - src/platform/tests/test-cleanup-linux \ - src/platform/tests/test-link-fake \ - src/platform/tests/test-link-linux \ - src/platform/tests/test-nmp-object \ - src/platform/tests/test-platform-general \ - src/platform/tests/test-route-fake \ - src/platform/tests/test-route-linux \ - src/platform/tests/test-tc-fake \ - src/platform/tests/test-tc-linux \ + src/core/platform/tests/test-address-fake \ + src/core/platform/tests/test-address-linux \ + src/core/platform/tests/test-cleanup-fake \ + src/core/platform/tests/test-cleanup-linux \ + src/core/platform/tests/test-link-fake \ + src/core/platform/tests/test-link-linux \ + src/core/platform/tests/test-nmp-object \ + src/core/platform/tests/test-platform-general \ + src/core/platform/tests/test-route-fake \ + src/core/platform/tests/test-route-linux \ + src/core/platform/tests/test-tc-fake \ + src/core/platform/tests/test-tc-linux \ $(NULL) -src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test) -src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_monitor_CPPFLAGS = $(src_core_cppflags_test) +src_core_platform_tests_monitor_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_monitor_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c -src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_address_fake_SOURCES = src/core/platform/tests/test-address.c +src_core_platform_tests_test_address_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) +src_core_platform_tests_test_address_fake_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_address_fake_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c -src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_address_linux_SOURCES = src/core/platform/tests/test-address.c +src_core_platform_tests_test_address_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) +src_core_platform_tests_test_address_linux_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_address_linux_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c -src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_cleanup_fake_SOURCES = src/core/platform/tests/test-cleanup.c +src_core_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) +src_core_platform_tests_test_cleanup_fake_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_cleanup_fake_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c -src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_cleanup_linux_SOURCES = src/core/platform/tests/test-cleanup.c +src_core_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) +src_core_platform_tests_test_cleanup_linux_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_cleanup_linux_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_link_fake_SOURCES = src/core/platform/tests/test-link.c +src_core_platform_tests_test_link_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) +src_core_platform_tests_test_link_fake_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_link_fake_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_link_linux_SOURCES = src/core/platform/tests/test-link.c +src_core_platform_tests_test_link_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) +src_core_platform_tests_test_link_linux_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_link_linux_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test) -src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la +src_core_platform_tests_test_nmp_object_CPPFLAGS = $(src_core_cppflags_test) +src_core_platform_tests_test_nmp_object_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_nmp_object_LDADD = src/core/libNetworkManagerTest.la -src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test) -src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la +src_core_platform_tests_test_platform_general_CPPFLAGS = $(src_core_cppflags_test) +src_core_platform_tests_test_platform_general_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_platform_general_LDADD = src/core/libNetworkManagerTest.la -src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_route_fake_SOURCES = src/core/platform/tests/test-route.c +src_core_platform_tests_test_route_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) +src_core_platform_tests_test_route_fake_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_route_fake_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_route_linux_SOURCES = src/core/platform/tests/test-route.c +src_core_platform_tests_test_route_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) +src_core_platform_tests_test_route_linux_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_route_linux_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_tc_fake_SOURCES = src/platform/tests/test-tc.c -src_platform_tests_test_tc_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_tc_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_tc_fake_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_tc_fake_SOURCES = src/core/platform/tests/test-tc.c +src_core_platform_tests_test_tc_fake_CPPFLAGS = $(src_core_tests_cppflags_fake) +src_core_platform_tests_test_tc_fake_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_tc_fake_LDADD = $(src_core_platform_tests_libadd) -src_platform_tests_test_tc_linux_SOURCES = src/platform/tests/test-tc.c -src_platform_tests_test_tc_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_tc_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_tc_linux_LDADD = $(src_platform_tests_libadd) +src_core_platform_tests_test_tc_linux_SOURCES = src/core/platform/tests/test-tc.c +src_core_platform_tests_test_tc_linux_CPPFLAGS = $(src_core_tests_cppflags_linux) +src_core_platform_tests_test_tc_linux_LDFLAGS = $(src_core_platform_tests_ldflags) +src_core_platform_tests_test_tc_linux_LDADD = $(src_core_platform_tests_libadd) -$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_tc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_tc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_tc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_platform_tests_test_tc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/platform/tests/meson.build \ + src/core/platform/tests/meson.build \ $(NULL) ############################################################################### -# src/devices/tests +# src/core/devices/tests ############################################################################### -src_devices_tests_ldflags = \ +src_core_devices_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) check_programs += \ - src/devices/tests/test-lldp \ - src/devices/tests/test-acd + src/core/devices/tests/test-lldp \ + src/core/devices/tests/test-acd -src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test) -src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_lldp_LDADD = \ - src/libNetworkManagerTest.la +src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test) +src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags) +src_core_devices_tests_test_lldp_LDADD = \ + src/core/libNetworkManagerTest.la -src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test) -src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_acd_LDADD = \ - src/libNetworkManagerTest.la +src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test) +src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags) +src_core_devices_tests_test_acd_LDADD = \ + src/core/libNetworkManagerTest.la -$(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/devices/tests/meson.build + src/core/devices/tests/meson.build ############################################################################### -# src/ndisc/tests +# src/core/ndisc/tests ############################################################################### -src_ndisc_tests_ldflags = \ +src_core_ndisc_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_ndisc_tests_ldadd = \ - src/libNetworkManagerTest.la \ +src_core_ndisc_tests_ldadd = \ + src/core/libNetworkManagerTest.la \ $(GLIB_LIBS) -check_programs += src/ndisc/tests/test-ndisc-fake -check_programs_norun += src/ndisc/tests/test-ndisc-linux +check_programs += src/core/ndisc/tests/test-ndisc-fake +check_programs_norun += src/core/ndisc/tests/test-ndisc-linux -src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test) -src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) -src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd) +src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_core_cppflags_test) +src_core_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_core_ndisc_tests_ldflags) +src_core_ndisc_tests_test_ndisc_linux_LDADD = $(src_core_ndisc_tests_ldadd) -src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test) -src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) -src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) +src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_core_cppflags_test) +src_core_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_core_ndisc_tests_ldflags) +src_core_ndisc_tests_test_ndisc_fake_LDADD = $(src_core_ndisc_tests_ldadd) -$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/ndisc/tests/meson.build + src/core/ndisc/tests/meson.build ############################################################################### -# src/supplicant/tests +# src/core/supplicant/tests ############################################################################### -check_programs += src/supplicant/tests/test-supplicant-config +check_programs += src/core/supplicant/tests/test-supplicant-config -src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test) +src_core_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_core_cppflags_test) -src_supplicant_tests_test_supplicant_config_LDADD = \ - src/libNetworkManagerTest.la +src_core_supplicant_tests_test_supplicant_config_LDADD = \ + src/core/libNetworkManagerTest.la -src_supplicant_tests_test_supplicant_config_LDFLAGS = \ +src_core_supplicant_tests_test_supplicant_config_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/supplicant/tests/certs/test-ca-cert.pem \ - src/supplicant/tests/certs/test-cert.p12 \ - src/supplicant/tests/meson.build + src/core/supplicant/tests/certs/test-ca-cert.pem \ + src/core/supplicant/tests/certs/test-cert.p12 \ + src/core/supplicant/tests/meson.build ############################################################################### -# src/tests/config +# src/core/tests/config ############################################################################### -check_programs += src/tests/config/test-config +check_programs += src/core/tests/config/test-config -src_tests_config_test_config_SOURCES = \ - src/tests/config/nm-test-device.c \ - src/tests/config/nm-test-device.h \ - src/tests/config/test-config.c +src_core_tests_config_test_config_SOURCES = \ + src/core/tests/config/nm-test-device.c \ + src/core/tests/config/nm-test-device.h \ + src/core/tests/config/test-config.c -src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test) +src_core_tests_config_test_config_CPPFLAGS = $(src_core_cppflags_test) -src_tests_config_test_config_LDADD = \ - src/libNetworkManagerTest.la +src_core_tests_config_test_config_LDADD = \ + src/core/libNetworkManagerTest.la -src_tests_config_test_config_LDFLAGS = \ +src_core_tests_config_test_config_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/tests/config/NetworkManager.conf \ - src/tests/config/NetworkManager-warn.conf \ - src/tests/config/NetworkManager.state \ - src/tests/config/bad.conf \ - src/tests/config/global-dns-invalid.conf \ - src/tests/config/conf.d/00-overrides.conf \ - src/tests/config/conf.d/10-more.conf \ - src/tests/config/conf.d/20-config-enable-1.conf \ - src/tests/config/conf.d/90-last.conf \ - src/tests/config/meson.build + src/core/tests/config/NetworkManager.conf \ + src/core/tests/config/NetworkManager-warn.conf \ + src/core/tests/config/NetworkManager.state \ + src/core/tests/config/bad.conf \ + src/core/tests/config/global-dns-invalid.conf \ + src/core/tests/config/conf.d/00-overrides.conf \ + src/core/tests/config/conf.d/10-more.conf \ + src/core/tests/config/conf.d/20-config-enable-1.conf \ + src/core/tests/config/conf.d/90-last.conf \ + src/core/tests/config/meson.build ############################################################################### -# src/tests +# src/core/tests ############################################################################### -src_tests_ldflags = \ +src_core_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_tests_ldadd = \ - src/libNetworkManagerTest.la +src_core_tests_ldadd = \ + src/core/libNetworkManagerTest.la check_programs += \ - src/tests/test-core \ - src/tests/test-core-with-expect \ - src/tests/test-dcb \ - src/tests/test-ip4-config \ - src/tests/test-ip6-config \ - src/tests/test-l3cfg \ - src/tests/test-systemd \ - src/tests/test-utils \ - src/tests/test-wired-defname \ + src/core/tests/test-core \ + src/core/tests/test-core-with-expect \ + src/core/tests/test-dcb \ + src/core/tests/test-ip4-config \ + src/core/tests/test-ip6-config \ + src/core/tests/test-l3cfg \ + src/core/tests/test-systemd \ + src/core/tests/test-utils \ + src/core/tests/test-wired-defname \ $(NULL) -src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test) -src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags) -src_tests_test_ip4_config_LDADD = $(src_tests_ldadd) +src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd) -src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test) -src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags) -src_tests_test_ip6_config_LDADD = $(src_tests_ldadd) +src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd) -src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test) -src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) -src_tests_test_dcb_LDADD = $(src_tests_ldadd) +src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd) -src_tests_test_core_CPPFLAGS = $(src_cppflags_test) -src_tests_test_core_LDFLAGS = $(src_tests_ldflags) -src_tests_test_core_LDADD = $(src_tests_ldadd) +src_core_tests_test_core_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_core_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_core_LDADD = $(src_core_tests_ldadd) -src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test) -src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags) -src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd) +src_core_tests_test_core_with_expect_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_core_with_expect_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_core_with_expect_LDADD = $(src_core_tests_ldadd) -src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test) -src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags) -src_tests_test_wired_defname_LDADD = $(src_tests_ldadd) +src_core_tests_test_wired_defname_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_wired_defname_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_wired_defname_LDADD = $(src_core_tests_ldadd) -src_tests_test_utils_CPPFLAGS = $(src_cppflags_test) -src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) -src_tests_test_utils_LDADD = $(src_tests_ldadd) +src_core_tests_test_utils_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_utils_LDFLAGS = $(src_core_tests_ldflags) +src_core_tests_test_utils_LDADD = $(src_core_tests_ldadd) -src_tests_test_l3cfg_CPPFLAGS = $(src_cppflags_test) -src_tests_test_l3cfg_LDFLAGS = $(src_devices_tests_ldflags) -src_tests_test_l3cfg_LDADD = $(src_tests_ldadd) +src_core_tests_test_l3cfg_CPPFLAGS = $(src_core_cppflags_test) +src_core_tests_test_l3cfg_LDFLAGS = $(src_core_devices_tests_ldflags) +src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd) -$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -src_tests_test_systemd_CPPFLAGS = \ - $(src_libnm_systemd_core_la_cppflags) \ +src_core_tests_test_systemd_CPPFLAGS = \ + $(src_core_libnm_systemd_core_la_cppflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ $(NULL) -src_tests_test_systemd_LDFLAGS = \ +src_core_tests_test_systemd_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -src_tests_test_systemd_LDADD = \ - src/libnm-systemd-core.la \ +src_core_tests_test_systemd_LDADD = \ + src/core/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/libcsiphash.la \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(NULL) -$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_core_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/tests/test-secret-agent.py \ - src/tests/meson.build + src/core/tests/test-secret-agent.py \ + src/core/tests/meson.build ############################################################################### # dispatcher @@ -5394,7 +5394,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) BUILT_SOURCES += $(typelib_DATA) dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA += src/org.freedesktop.NetworkManager.conf +dbusservice_DATA += src/core/org.freedesktop.NetworkManager.conf ############################################################################### @@ -5422,7 +5422,7 @@ EXTRA_DIST += \ linker-script-binary.ver \ linker-script-devices.ver \ linker-script-settings.ver \ - src/ppp/nm-ppp-plugin.ver \ + src/core/ppp/nm-ppp-plugin.ver \ Makefile.glib \ autogen.sh \ lsan.suppressions \ @@ -5462,7 +5462,7 @@ EXTRA_DIST += \ tools/test-sudo-wrapper.sh \ tools/enums-to-docbook.pl \ \ - src/settings/plugins/meson.build \ + src/core/settings/plugins/meson.build \ \ $(NULL) diff --git a/autogen.sh b/autogen.sh index ca9253f1b..880980617 100755 --- a/autogen.sh +++ b/autogen.sh @@ -14,7 +14,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9 PKG_NAME=NetworkManager (test -f $srcdir/configure.ac \ - && test -f $srcdir/src/main.c) || { + && test -f $srcdir/src/core/main.c) || { printf "**Error**: Directory "\`$srcdir\'" does not look like the" >&2 echo " top-level $PKG_NAME directory" >&2 exit 1 diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh index 70eb5a7f3..2de32aafc 100755 --- a/contrib/scripts/nm-code-format.sh +++ b/contrib/scripts/nm-code-format.sh @@ -18,7 +18,7 @@ EXCLUDE=( ":(exclude)shared/n-dhcp4" ":(exclude)shared/nm-std-aux/unaligned.h" ":(exclude)shared/systemd/src" - ":(exclude)src/systemd/src" + ":(exclude)src/core/systemd/src" ) NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository" diff --git a/meson.build b/meson.build index 357fcf634..560fa712d 100644 --- a/meson.build +++ b/meson.build @@ -905,7 +905,7 @@ subdir('introspection') subdir('shared') subdir('libnm-core') subdir('libnm') -subdir('src') +subdir('src/core') subdir('dispatcher') subdir('clients') subdir('data') diff --git a/po/POTFILES.in b/po/POTFILES.in index b3d33487b..e48d9a8e2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -148,38 +148,38 @@ libnm/nm-vpn-service-plugin.c data/org.freedesktop.NetworkManager.policy.in.in shared/nm-glib-aux/nm-shared-utils.c shared/nm-log-core/nm-logging.c -src/NetworkManagerUtils.c -src/main.c -src/main-utils.c -src/dhcp/nm-dhcp-dhclient.c -src/dhcp/nm-dhcp-dhclient-utils.c -src/dhcp/nm-dhcp-manager.c -src/dns/nm-dns-manager.c -src/devices/adsl/nm-device-adsl.c -src/devices/bluetooth/nm-bluez-manager.c -src/devices/bluetooth/nm-device-bt.c -src/devices/nm-device-6lowpan.c -src/devices/nm-device-bond.c -src/devices/nm-device-bridge.c -src/devices/nm-device-dummy.c -src/devices/nm-device-ethernet.c -src/devices/nm-device-ethernet-utils.c -src/devices/nm-device-infiniband.c -src/devices/nm-device-ip-tunnel.c -src/devices/nm-device-macvlan.c -src/devices/nm-device-tun.c -src/devices/nm-device-veth.c -src/devices/nm-device-vlan.c -src/devices/nm-device-vrf.c -src/devices/nm-device-vxlan.c -src/devices/nm-device-wpan.c -src/devices/team/nm-device-team.c -src/devices/wifi/nm-device-olpc-mesh.c -src/devices/wifi/nm-device-wifi.c -src/devices/wifi/nm-wifi-utils.c -src/devices/wwan/nm-modem-broadband.c -src/nm-config.c -src/nm-iface-helper.c -src/nm-manager.c -src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c -src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +src/core/NetworkManagerUtils.c +src/core/main.c +src/core/main-utils.c +src/core/dhcp/nm-dhcp-dhclient.c +src/core/dhcp/nm-dhcp-dhclient-utils.c +src/core/dhcp/nm-dhcp-manager.c +src/core/dns/nm-dns-manager.c +src/core/devices/adsl/nm-device-adsl.c +src/core/devices/bluetooth/nm-bluez-manager.c +src/core/devices/bluetooth/nm-device-bt.c +src/core/devices/nm-device-6lowpan.c +src/core/devices/nm-device-bond.c +src/core/devices/nm-device-bridge.c +src/core/devices/nm-device-dummy.c +src/core/devices/nm-device-ethernet.c +src/core/devices/nm-device-ethernet-utils.c +src/core/devices/nm-device-infiniband.c +src/core/devices/nm-device-ip-tunnel.c +src/core/devices/nm-device-macvlan.c +src/core/devices/nm-device-tun.c +src/core/devices/nm-device-veth.c +src/core/devices/nm-device-vlan.c +src/core/devices/nm-device-vrf.c +src/core/devices/nm-device-vxlan.c +src/core/devices/nm-device-wpan.c +src/core/devices/team/nm-device-team.c +src/core/devices/wifi/nm-device-olpc-mesh.c +src/core/devices/wifi/nm-device-wifi.c +src/core/devices/wifi/nm-wifi-utils.c +src/core/devices/wwan/nm-modem-broadband.c +src/core/nm-config.c +src/core/nm-iface-helper.c +src/core/nm-manager.c +src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c diff --git a/src/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c similarity index 100% rename from src/NetworkManagerUtils.c rename to src/core/NetworkManagerUtils.c diff --git a/src/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h similarity index 100% rename from src/NetworkManagerUtils.h rename to src/core/NetworkManagerUtils.h diff --git a/src/devices/adsl/meson.build b/src/core/devices/adsl/meson.build similarity index 100% rename from src/devices/adsl/meson.build rename to src/core/devices/adsl/meson.build diff --git a/src/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c similarity index 100% rename from src/devices/adsl/nm-atm-manager.c rename to src/core/devices/adsl/nm-atm-manager.c diff --git a/src/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c similarity index 100% rename from src/devices/adsl/nm-device-adsl.c rename to src/core/devices/adsl/nm-device-adsl.c diff --git a/src/devices/adsl/nm-device-adsl.h b/src/core/devices/adsl/nm-device-adsl.h similarity index 100% rename from src/devices/adsl/nm-device-adsl.h rename to src/core/devices/adsl/nm-device-adsl.h diff --git a/src/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build similarity index 100% rename from src/devices/bluetooth/meson.build rename to src/core/devices/bluetooth/meson.build diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/core/devices/bluetooth/nm-bluez-common.h similarity index 100% rename from src/devices/bluetooth/nm-bluez-common.h rename to src/core/devices/bluetooth/nm-bluez-common.h diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c similarity index 100% rename from src/devices/bluetooth/nm-bluez-manager.c rename to src/core/devices/bluetooth/nm-bluez-manager.c diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/core/devices/bluetooth/nm-bluez-manager.h similarity index 100% rename from src/devices/bluetooth/nm-bluez-manager.h rename to src/core/devices/bluetooth/nm-bluez-manager.h diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c similarity index 100% rename from src/devices/bluetooth/nm-bluez5-dun.c rename to src/core/devices/bluetooth/nm-bluez5-dun.c diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/core/devices/bluetooth/nm-bluez5-dun.h similarity index 100% rename from src/devices/bluetooth/nm-bluez5-dun.h rename to src/core/devices/bluetooth/nm-bluez5-dun.h diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/core/devices/bluetooth/nm-bt-error.c similarity index 100% rename from src/devices/bluetooth/nm-bt-error.c rename to src/core/devices/bluetooth/nm-bt-error.c diff --git a/src/devices/bluetooth/nm-bt-error.h b/src/core/devices/bluetooth/nm-bt-error.h similarity index 100% rename from src/devices/bluetooth/nm-bt-error.h rename to src/core/devices/bluetooth/nm-bt-error.h diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c similarity index 100% rename from src/devices/bluetooth/nm-device-bt.c rename to src/core/devices/bluetooth/nm-device-bt.c diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/core/devices/bluetooth/nm-device-bt.h similarity index 100% rename from src/devices/bluetooth/nm-device-bt.h rename to src/core/devices/bluetooth/nm-device-bt.h diff --git a/src/devices/bluetooth/tests/nm-bt-test.c b/src/core/devices/bluetooth/tests/nm-bt-test.c similarity index 100% rename from src/devices/bluetooth/tests/nm-bt-test.c rename to src/core/devices/bluetooth/tests/nm-bt-test.c diff --git a/src/devices/meson.build b/src/core/devices/meson.build similarity index 100% rename from src/devices/meson.build rename to src/core/devices/meson.build diff --git a/src/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c similarity index 100% rename from src/devices/nm-acd-manager.c rename to src/core/devices/nm-acd-manager.c diff --git a/src/devices/nm-acd-manager.h b/src/core/devices/nm-acd-manager.h similarity index 100% rename from src/devices/nm-acd-manager.h rename to src/core/devices/nm-acd-manager.h diff --git a/src/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c similarity index 100% rename from src/devices/nm-device-6lowpan.c rename to src/core/devices/nm-device-6lowpan.c diff --git a/src/devices/nm-device-6lowpan.h b/src/core/devices/nm-device-6lowpan.h similarity index 100% rename from src/devices/nm-device-6lowpan.h rename to src/core/devices/nm-device-6lowpan.h diff --git a/src/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c similarity index 100% rename from src/devices/nm-device-bond.c rename to src/core/devices/nm-device-bond.c diff --git a/src/devices/nm-device-bond.h b/src/core/devices/nm-device-bond.h similarity index 100% rename from src/devices/nm-device-bond.h rename to src/core/devices/nm-device-bond.h diff --git a/src/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c similarity index 100% rename from src/devices/nm-device-bridge.c rename to src/core/devices/nm-device-bridge.c diff --git a/src/devices/nm-device-bridge.h b/src/core/devices/nm-device-bridge.h similarity index 100% rename from src/devices/nm-device-bridge.h rename to src/core/devices/nm-device-bridge.h diff --git a/src/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c similarity index 100% rename from src/devices/nm-device-dummy.c rename to src/core/devices/nm-device-dummy.c diff --git a/src/devices/nm-device-dummy.h b/src/core/devices/nm-device-dummy.h similarity index 100% rename from src/devices/nm-device-dummy.h rename to src/core/devices/nm-device-dummy.h diff --git a/src/devices/nm-device-ethernet-utils.c b/src/core/devices/nm-device-ethernet-utils.c similarity index 100% rename from src/devices/nm-device-ethernet-utils.c rename to src/core/devices/nm-device-ethernet-utils.c diff --git a/src/devices/nm-device-ethernet-utils.h b/src/core/devices/nm-device-ethernet-utils.h similarity index 100% rename from src/devices/nm-device-ethernet-utils.h rename to src/core/devices/nm-device-ethernet-utils.h diff --git a/src/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c similarity index 100% rename from src/devices/nm-device-ethernet.c rename to src/core/devices/nm-device-ethernet.c diff --git a/src/devices/nm-device-ethernet.h b/src/core/devices/nm-device-ethernet.h similarity index 100% rename from src/devices/nm-device-ethernet.h rename to src/core/devices/nm-device-ethernet.h diff --git a/src/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c similarity index 100% rename from src/devices/nm-device-factory.c rename to src/core/devices/nm-device-factory.c diff --git a/src/devices/nm-device-factory.h b/src/core/devices/nm-device-factory.h similarity index 100% rename from src/devices/nm-device-factory.h rename to src/core/devices/nm-device-factory.h diff --git a/src/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c similarity index 100% rename from src/devices/nm-device-generic.c rename to src/core/devices/nm-device-generic.c diff --git a/src/devices/nm-device-generic.h b/src/core/devices/nm-device-generic.h similarity index 100% rename from src/devices/nm-device-generic.h rename to src/core/devices/nm-device-generic.h diff --git a/src/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c similarity index 100% rename from src/devices/nm-device-infiniband.c rename to src/core/devices/nm-device-infiniband.c diff --git a/src/devices/nm-device-infiniband.h b/src/core/devices/nm-device-infiniband.h similarity index 100% rename from src/devices/nm-device-infiniband.h rename to src/core/devices/nm-device-infiniband.h diff --git a/src/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c similarity index 100% rename from src/devices/nm-device-ip-tunnel.c rename to src/core/devices/nm-device-ip-tunnel.c diff --git a/src/devices/nm-device-ip-tunnel.h b/src/core/devices/nm-device-ip-tunnel.h similarity index 100% rename from src/devices/nm-device-ip-tunnel.h rename to src/core/devices/nm-device-ip-tunnel.h diff --git a/src/devices/nm-device-logging.h b/src/core/devices/nm-device-logging.h similarity index 100% rename from src/devices/nm-device-logging.h rename to src/core/devices/nm-device-logging.h diff --git a/src/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c similarity index 100% rename from src/devices/nm-device-macsec.c rename to src/core/devices/nm-device-macsec.c diff --git a/src/devices/nm-device-macsec.h b/src/core/devices/nm-device-macsec.h similarity index 100% rename from src/devices/nm-device-macsec.h rename to src/core/devices/nm-device-macsec.h diff --git a/src/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c similarity index 100% rename from src/devices/nm-device-macvlan.c rename to src/core/devices/nm-device-macvlan.c diff --git a/src/devices/nm-device-macvlan.h b/src/core/devices/nm-device-macvlan.h similarity index 100% rename from src/devices/nm-device-macvlan.h rename to src/core/devices/nm-device-macvlan.h diff --git a/src/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c similarity index 100% rename from src/devices/nm-device-ppp.c rename to src/core/devices/nm-device-ppp.c diff --git a/src/devices/nm-device-ppp.h b/src/core/devices/nm-device-ppp.h similarity index 100% rename from src/devices/nm-device-ppp.h rename to src/core/devices/nm-device-ppp.h diff --git a/src/devices/nm-device-private.h b/src/core/devices/nm-device-private.h similarity index 100% rename from src/devices/nm-device-private.h rename to src/core/devices/nm-device-private.h diff --git a/src/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c similarity index 100% rename from src/devices/nm-device-tun.c rename to src/core/devices/nm-device-tun.c diff --git a/src/devices/nm-device-tun.h b/src/core/devices/nm-device-tun.h similarity index 100% rename from src/devices/nm-device-tun.h rename to src/core/devices/nm-device-tun.h diff --git a/src/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c similarity index 100% rename from src/devices/nm-device-veth.c rename to src/core/devices/nm-device-veth.c diff --git a/src/devices/nm-device-veth.h b/src/core/devices/nm-device-veth.h similarity index 100% rename from src/devices/nm-device-veth.h rename to src/core/devices/nm-device-veth.h diff --git a/src/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c similarity index 100% rename from src/devices/nm-device-vlan.c rename to src/core/devices/nm-device-vlan.c diff --git a/src/devices/nm-device-vlan.h b/src/core/devices/nm-device-vlan.h similarity index 100% rename from src/devices/nm-device-vlan.h rename to src/core/devices/nm-device-vlan.h diff --git a/src/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c similarity index 100% rename from src/devices/nm-device-vrf.c rename to src/core/devices/nm-device-vrf.c diff --git a/src/devices/nm-device-vrf.h b/src/core/devices/nm-device-vrf.h similarity index 100% rename from src/devices/nm-device-vrf.h rename to src/core/devices/nm-device-vrf.h diff --git a/src/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c similarity index 100% rename from src/devices/nm-device-vxlan.c rename to src/core/devices/nm-device-vxlan.c diff --git a/src/devices/nm-device-vxlan.h b/src/core/devices/nm-device-vxlan.h similarity index 100% rename from src/devices/nm-device-vxlan.h rename to src/core/devices/nm-device-vxlan.h diff --git a/src/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c similarity index 100% rename from src/devices/nm-device-wireguard.c rename to src/core/devices/nm-device-wireguard.c diff --git a/src/devices/nm-device-wireguard.h b/src/core/devices/nm-device-wireguard.h similarity index 100% rename from src/devices/nm-device-wireguard.h rename to src/core/devices/nm-device-wireguard.h diff --git a/src/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c similarity index 100% rename from src/devices/nm-device-wpan.c rename to src/core/devices/nm-device-wpan.c diff --git a/src/devices/nm-device-wpan.h b/src/core/devices/nm-device-wpan.h similarity index 100% rename from src/devices/nm-device-wpan.h rename to src/core/devices/nm-device-wpan.h diff --git a/src/devices/nm-device.c b/src/core/devices/nm-device.c similarity index 100% rename from src/devices/nm-device.c rename to src/core/devices/nm-device.c diff --git a/src/devices/nm-device.h b/src/core/devices/nm-device.h similarity index 100% rename from src/devices/nm-device.h rename to src/core/devices/nm-device.h diff --git a/src/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c similarity index 100% rename from src/devices/nm-lldp-listener.c rename to src/core/devices/nm-lldp-listener.c diff --git a/src/devices/nm-lldp-listener.h b/src/core/devices/nm-lldp-listener.h similarity index 100% rename from src/devices/nm-lldp-listener.h rename to src/core/devices/nm-lldp-listener.h diff --git a/src/devices/ovs/meson.build b/src/core/devices/ovs/meson.build similarity index 100% rename from src/devices/ovs/meson.build rename to src/core/devices/ovs/meson.build diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c similarity index 100% rename from src/devices/ovs/nm-device-ovs-bridge.c rename to src/core/devices/ovs/nm-device-ovs-bridge.c diff --git a/src/devices/ovs/nm-device-ovs-bridge.h b/src/core/devices/ovs/nm-device-ovs-bridge.h similarity index 100% rename from src/devices/ovs/nm-device-ovs-bridge.h rename to src/core/devices/ovs/nm-device-ovs-bridge.h diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c similarity index 100% rename from src/devices/ovs/nm-device-ovs-interface.c rename to src/core/devices/ovs/nm-device-ovs-interface.c diff --git a/src/devices/ovs/nm-device-ovs-interface.h b/src/core/devices/ovs/nm-device-ovs-interface.h similarity index 100% rename from src/devices/ovs/nm-device-ovs-interface.h rename to src/core/devices/ovs/nm-device-ovs-interface.h diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c similarity index 100% rename from src/devices/ovs/nm-device-ovs-port.c rename to src/core/devices/ovs/nm-device-ovs-port.c diff --git a/src/devices/ovs/nm-device-ovs-port.h b/src/core/devices/ovs/nm-device-ovs-port.h similarity index 100% rename from src/devices/ovs/nm-device-ovs-port.h rename to src/core/devices/ovs/nm-device-ovs-port.h diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c similarity index 100% rename from src/devices/ovs/nm-ovs-factory.c rename to src/core/devices/ovs/nm-ovs-factory.c diff --git a/src/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c similarity index 100% rename from src/devices/ovs/nm-ovsdb.c rename to src/core/devices/ovs/nm-ovsdb.c diff --git a/src/devices/ovs/nm-ovsdb.h b/src/core/devices/ovs/nm-ovsdb.h similarity index 100% rename from src/devices/ovs/nm-ovsdb.h rename to src/core/devices/ovs/nm-ovsdb.h diff --git a/src/devices/team/meson.build b/src/core/devices/team/meson.build similarity index 100% rename from src/devices/team/meson.build rename to src/core/devices/team/meson.build diff --git a/src/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c similarity index 100% rename from src/devices/team/nm-device-team.c rename to src/core/devices/team/nm-device-team.c diff --git a/src/devices/team/nm-device-team.h b/src/core/devices/team/nm-device-team.h similarity index 100% rename from src/devices/team/nm-device-team.h rename to src/core/devices/team/nm-device-team.h diff --git a/src/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c similarity index 100% rename from src/devices/team/nm-team-factory.c rename to src/core/devices/team/nm-team-factory.c diff --git a/src/devices/tests/meson.build b/src/core/devices/tests/meson.build similarity index 100% rename from src/devices/tests/meson.build rename to src/core/devices/tests/meson.build diff --git a/src/devices/tests/test-acd.c b/src/core/devices/tests/test-acd.c similarity index 100% rename from src/devices/tests/test-acd.c rename to src/core/devices/tests/test-acd.c diff --git a/src/devices/tests/test-lldp.c b/src/core/devices/tests/test-lldp.c similarity index 100% rename from src/devices/tests/test-lldp.c rename to src/core/devices/tests/test-lldp.c diff --git a/src/devices/wifi/meson.build b/src/core/devices/wifi/meson.build similarity index 100% rename from src/devices/wifi/meson.build rename to src/core/devices/wifi/meson.build diff --git a/src/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c similarity index 100% rename from src/devices/wifi/nm-device-iwd.c rename to src/core/devices/wifi/nm-device-iwd.c diff --git a/src/devices/wifi/nm-device-iwd.h b/src/core/devices/wifi/nm-device-iwd.h similarity index 100% rename from src/devices/wifi/nm-device-iwd.h rename to src/core/devices/wifi/nm-device-iwd.h diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c similarity index 100% rename from src/devices/wifi/nm-device-olpc-mesh.c rename to src/core/devices/wifi/nm-device-olpc-mesh.c diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/core/devices/wifi/nm-device-olpc-mesh.h similarity index 100% rename from src/devices/wifi/nm-device-olpc-mesh.h rename to src/core/devices/wifi/nm-device-olpc-mesh.h diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c similarity index 100% rename from src/devices/wifi/nm-device-wifi-p2p.c rename to src/core/devices/wifi/nm-device-wifi-p2p.c diff --git a/src/devices/wifi/nm-device-wifi-p2p.h b/src/core/devices/wifi/nm-device-wifi-p2p.h similarity index 100% rename from src/devices/wifi/nm-device-wifi-p2p.h rename to src/core/devices/wifi/nm-device-wifi-p2p.h diff --git a/src/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c similarity index 100% rename from src/devices/wifi/nm-device-wifi.c rename to src/core/devices/wifi/nm-device-wifi.c diff --git a/src/devices/wifi/nm-device-wifi.h b/src/core/devices/wifi/nm-device-wifi.h similarity index 100% rename from src/devices/wifi/nm-device-wifi.h rename to src/core/devices/wifi/nm-device-wifi.h diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c similarity index 100% rename from src/devices/wifi/nm-iwd-manager.c rename to src/core/devices/wifi/nm-iwd-manager.c diff --git a/src/devices/wifi/nm-iwd-manager.h b/src/core/devices/wifi/nm-iwd-manager.h similarity index 100% rename from src/devices/wifi/nm-iwd-manager.h rename to src/core/devices/wifi/nm-iwd-manager.h diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c similarity index 100% rename from src/devices/wifi/nm-wifi-ap.c rename to src/core/devices/wifi/nm-wifi-ap.c diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/core/devices/wifi/nm-wifi-ap.h similarity index 100% rename from src/devices/wifi/nm-wifi-ap.h rename to src/core/devices/wifi/nm-wifi-ap.h diff --git a/src/devices/wifi/nm-wifi-common.c b/src/core/devices/wifi/nm-wifi-common.c similarity index 100% rename from src/devices/wifi/nm-wifi-common.c rename to src/core/devices/wifi/nm-wifi-common.c diff --git a/src/devices/wifi/nm-wifi-common.h b/src/core/devices/wifi/nm-wifi-common.h similarity index 100% rename from src/devices/wifi/nm-wifi-common.h rename to src/core/devices/wifi/nm-wifi-common.h diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c similarity index 100% rename from src/devices/wifi/nm-wifi-factory.c rename to src/core/devices/wifi/nm-wifi-factory.c diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c similarity index 100% rename from src/devices/wifi/nm-wifi-p2p-peer.c rename to src/core/devices/wifi/nm-wifi-p2p-peer.c diff --git a/src/devices/wifi/nm-wifi-p2p-peer.h b/src/core/devices/wifi/nm-wifi-p2p-peer.h similarity index 100% rename from src/devices/wifi/nm-wifi-p2p-peer.h rename to src/core/devices/wifi/nm-wifi-p2p-peer.h diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c similarity index 100% rename from src/devices/wifi/nm-wifi-utils.c rename to src/core/devices/wifi/nm-wifi-utils.c diff --git a/src/devices/wifi/nm-wifi-utils.h b/src/core/devices/wifi/nm-wifi-utils.h similarity index 100% rename from src/devices/wifi/nm-wifi-utils.h rename to src/core/devices/wifi/nm-wifi-utils.h diff --git a/src/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c similarity index 100% rename from src/devices/wifi/tests/test-devices-wifi.c rename to src/core/devices/wifi/tests/test-devices-wifi.c diff --git a/src/devices/wwan/libnm-wwan.ver b/src/core/devices/wwan/libnm-wwan.ver similarity index 100% rename from src/devices/wwan/libnm-wwan.ver rename to src/core/devices/wwan/libnm-wwan.ver diff --git a/src/devices/wwan/meson.build b/src/core/devices/wwan/meson.build similarity index 100% rename from src/devices/wwan/meson.build rename to src/core/devices/wwan/meson.build diff --git a/src/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c similarity index 100% rename from src/devices/wwan/nm-device-modem.c rename to src/core/devices/wwan/nm-device-modem.c diff --git a/src/devices/wwan/nm-device-modem.h b/src/core/devices/wwan/nm-device-modem.h similarity index 100% rename from src/devices/wwan/nm-device-modem.h rename to src/core/devices/wwan/nm-device-modem.h diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c similarity index 100% rename from src/devices/wwan/nm-modem-broadband.c rename to src/core/devices/wwan/nm-modem-broadband.c diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/core/devices/wwan/nm-modem-broadband.h similarity index 100% rename from src/devices/wwan/nm-modem-broadband.h rename to src/core/devices/wwan/nm-modem-broadband.h diff --git a/src/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c similarity index 100% rename from src/devices/wwan/nm-modem-manager.c rename to src/core/devices/wwan/nm-modem-manager.c diff --git a/src/devices/wwan/nm-modem-manager.h b/src/core/devices/wwan/nm-modem-manager.h similarity index 100% rename from src/devices/wwan/nm-modem-manager.h rename to src/core/devices/wwan/nm-modem-manager.h diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c similarity index 100% rename from src/devices/wwan/nm-modem-ofono.c rename to src/core/devices/wwan/nm-modem-ofono.c diff --git a/src/devices/wwan/nm-modem-ofono.h b/src/core/devices/wwan/nm-modem-ofono.h similarity index 100% rename from src/devices/wwan/nm-modem-ofono.h rename to src/core/devices/wwan/nm-modem-ofono.h diff --git a/src/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c similarity index 100% rename from src/devices/wwan/nm-modem.c rename to src/core/devices/wwan/nm-modem.c diff --git a/src/devices/wwan/nm-modem.h b/src/core/devices/wwan/nm-modem.h similarity index 100% rename from src/devices/wwan/nm-modem.h rename to src/core/devices/wwan/nm-modem.h diff --git a/src/devices/wwan/nm-service-providers.c b/src/core/devices/wwan/nm-service-providers.c similarity index 100% rename from src/devices/wwan/nm-service-providers.c rename to src/core/devices/wwan/nm-service-providers.c diff --git a/src/devices/wwan/nm-service-providers.h b/src/core/devices/wwan/nm-service-providers.h similarity index 100% rename from src/devices/wwan/nm-service-providers.h rename to src/core/devices/wwan/nm-service-providers.h diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/core/devices/wwan/nm-wwan-factory.c similarity index 100% rename from src/devices/wwan/nm-wwan-factory.c rename to src/core/devices/wwan/nm-wwan-factory.c diff --git a/src/devices/wwan/tests/test-service-providers.c b/src/core/devices/wwan/tests/test-service-providers.c similarity index 94% rename from src/devices/wwan/tests/test-service-providers.c rename to src/core/devices/wwan/tests/test-service-providers.c index 3ac3fed50..2c54a7640 100644 --- a/src/devices/wwan/tests/test-service-providers.c +++ b/src/core/devices/wwan/tests/test-service-providers.c @@ -43,7 +43,7 @@ test_positive(void) GMainLoop *loop = g_main_loop_new(NULL, FALSE); nm_service_providers_find_gsm_apn(NM_BUILD_SRCDIR - "/src/devices/wwan/tests/test-service-providers.xml", + "/src/core/devices/wwan/tests/test-service-providers.xml", "13337", NULL, test_positive_cb, @@ -76,7 +76,7 @@ test_negative(void) GMainLoop *loop = g_main_loop_new(NULL, FALSE); nm_service_providers_find_gsm_apn(NM_BUILD_SRCDIR - "/src/devices/wwan/tests/test-service-providers.xml", + "/src/core/devices/wwan/tests/test-service-providers.xml", "78130", NULL, test_negative_cb, diff --git a/src/devices/wwan/tests/test-service-providers.xml b/src/core/devices/wwan/tests/test-service-providers.xml similarity index 100% rename from src/devices/wwan/tests/test-service-providers.xml rename to src/core/devices/wwan/tests/test-service-providers.xml diff --git a/src/dhcp/meson.build b/src/core/dhcp/meson.build similarity index 100% rename from src/dhcp/meson.build rename to src/core/dhcp/meson.build diff --git a/src/dhcp/nm-dhcp-client-logging.h b/src/core/dhcp/nm-dhcp-client-logging.h similarity index 100% rename from src/dhcp/nm-dhcp-client-logging.h rename to src/core/dhcp/nm-dhcp-client-logging.h diff --git a/src/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c similarity index 100% rename from src/dhcp/nm-dhcp-client.c rename to src/core/dhcp/nm-dhcp-client.c diff --git a/src/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h similarity index 100% rename from src/dhcp/nm-dhcp-client.h rename to src/core/dhcp/nm-dhcp-client.h diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c similarity index 100% rename from src/dhcp/nm-dhcp-dhclient-utils.c rename to src/core/dhcp/nm-dhcp-dhclient-utils.c diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/core/dhcp/nm-dhcp-dhclient-utils.h similarity index 100% rename from src/dhcp/nm-dhcp-dhclient-utils.h rename to src/core/dhcp/nm-dhcp-dhclient-utils.h diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c similarity index 100% rename from src/dhcp/nm-dhcp-dhclient.c rename to src/core/dhcp/nm-dhcp-dhclient.c diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/core/dhcp/nm-dhcp-dhcpcanon.c similarity index 100% rename from src/dhcp/nm-dhcp-dhcpcanon.c rename to src/core/dhcp/nm-dhcp-dhcpcanon.c diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/core/dhcp/nm-dhcp-dhcpcd.c similarity index 100% rename from src/dhcp/nm-dhcp-dhcpcd.c rename to src/core/dhcp/nm-dhcp-dhcpcd.c diff --git a/src/dhcp/nm-dhcp-helper-api.h b/src/core/dhcp/nm-dhcp-helper-api.h similarity index 100% rename from src/dhcp/nm-dhcp-helper-api.h rename to src/core/dhcp/nm-dhcp-helper-api.h diff --git a/src/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c similarity index 100% rename from src/dhcp/nm-dhcp-helper.c rename to src/core/dhcp/nm-dhcp-helper.c diff --git a/src/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c similarity index 100% rename from src/dhcp/nm-dhcp-listener.c rename to src/core/dhcp/nm-dhcp-listener.c diff --git a/src/dhcp/nm-dhcp-listener.h b/src/core/dhcp/nm-dhcp-listener.h similarity index 100% rename from src/dhcp/nm-dhcp-listener.h rename to src/core/dhcp/nm-dhcp-listener.h diff --git a/src/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c similarity index 100% rename from src/dhcp/nm-dhcp-manager.c rename to src/core/dhcp/nm-dhcp-manager.c diff --git a/src/dhcp/nm-dhcp-manager.h b/src/core/dhcp/nm-dhcp-manager.h similarity index 100% rename from src/dhcp/nm-dhcp-manager.h rename to src/core/dhcp/nm-dhcp-manager.h diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c similarity index 100% rename from src/dhcp/nm-dhcp-nettools.c rename to src/core/dhcp/nm-dhcp-nettools.c diff --git a/src/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c similarity index 100% rename from src/dhcp/nm-dhcp-options.c rename to src/core/dhcp/nm-dhcp-options.c diff --git a/src/dhcp/nm-dhcp-options.h b/src/core/dhcp/nm-dhcp-options.h similarity index 100% rename from src/dhcp/nm-dhcp-options.h rename to src/core/dhcp/nm-dhcp-options.h diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c similarity index 100% rename from src/dhcp/nm-dhcp-systemd.c rename to src/core/dhcp/nm-dhcp-systemd.c diff --git a/src/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c similarity index 100% rename from src/dhcp/nm-dhcp-utils.c rename to src/core/dhcp/nm-dhcp-utils.c diff --git a/src/dhcp/nm-dhcp-utils.h b/src/core/dhcp/nm-dhcp-utils.h similarity index 100% rename from src/dhcp/nm-dhcp-utils.h rename to src/core/dhcp/nm-dhcp-utils.h diff --git a/src/dhcp/tests/meson.build b/src/core/dhcp/tests/meson.build similarity index 100% rename from src/dhcp/tests/meson.build rename to src/core/dhcp/tests/meson.build diff --git a/src/dhcp/tests/test-dhclient-commented-duid.leases b/src/core/dhcp/tests/test-dhclient-commented-duid.leases similarity index 100% rename from src/dhcp/tests/test-dhclient-commented-duid.leases rename to src/core/dhcp/tests/test-dhclient-commented-duid.leases diff --git a/src/dhcp/tests/test-dhclient-duid.leases b/src/core/dhcp/tests/test-dhclient-duid.leases similarity index 100% rename from src/dhcp/tests/test-dhclient-duid.leases rename to src/core/dhcp/tests/test-dhclient-duid.leases diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c similarity index 99% rename from src/dhcp/tests/test-dhcp-dhclient.c rename to src/core/dhcp/tests/test-dhcp-dhclient.c index 4821aa808..6b3ec7a12 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/core/dhcp/tests/test-dhcp-dhclient.c @@ -20,7 +20,7 @@ #include "nm-test-utils-core.h" -#define TEST_DIR NM_BUILD_SRCDIR "/src/dhcp/tests" +#define TEST_DIR NM_BUILD_SRCDIR "/src/core/dhcp/tests" #define TEST_MUDURL "https://example.com/mud.json" static void diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c similarity index 100% rename from src/dhcp/tests/test-dhcp-utils.c rename to src/core/dhcp/tests/test-dhcp-utils.c diff --git a/src/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c similarity index 100% rename from src/dns/nm-dns-dnsmasq.c rename to src/core/dns/nm-dns-dnsmasq.c diff --git a/src/dns/nm-dns-dnsmasq.h b/src/core/dns/nm-dns-dnsmasq.h similarity index 100% rename from src/dns/nm-dns-dnsmasq.h rename to src/core/dns/nm-dns-dnsmasq.h diff --git a/src/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c similarity index 100% rename from src/dns/nm-dns-manager.c rename to src/core/dns/nm-dns-manager.c diff --git a/src/dns/nm-dns-manager.h b/src/core/dns/nm-dns-manager.h similarity index 100% rename from src/dns/nm-dns-manager.h rename to src/core/dns/nm-dns-manager.h diff --git a/src/dns/nm-dns-plugin.c b/src/core/dns/nm-dns-plugin.c similarity index 100% rename from src/dns/nm-dns-plugin.c rename to src/core/dns/nm-dns-plugin.c diff --git a/src/dns/nm-dns-plugin.h b/src/core/dns/nm-dns-plugin.h similarity index 100% rename from src/dns/nm-dns-plugin.h rename to src/core/dns/nm-dns-plugin.h diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c similarity index 100% rename from src/dns/nm-dns-systemd-resolved.c rename to src/core/dns/nm-dns-systemd-resolved.c diff --git a/src/dns/nm-dns-systemd-resolved.h b/src/core/dns/nm-dns-systemd-resolved.h similarity index 100% rename from src/dns/nm-dns-systemd-resolved.h rename to src/core/dns/nm-dns-systemd-resolved.h diff --git a/src/dns/nm-dns-unbound.c b/src/core/dns/nm-dns-unbound.c similarity index 100% rename from src/dns/nm-dns-unbound.c rename to src/core/dns/nm-dns-unbound.c diff --git a/src/dns/nm-dns-unbound.h b/src/core/dns/nm-dns-unbound.h similarity index 100% rename from src/dns/nm-dns-unbound.h rename to src/core/dns/nm-dns-unbound.h diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c similarity index 100% rename from src/dnsmasq/nm-dnsmasq-manager.c rename to src/core/dnsmasq/nm-dnsmasq-manager.c diff --git a/src/dnsmasq/nm-dnsmasq-manager.h b/src/core/dnsmasq/nm-dnsmasq-manager.h similarity index 100% rename from src/dnsmasq/nm-dnsmasq-manager.h rename to src/core/dnsmasq/nm-dnsmasq-manager.h diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/core/dnsmasq/nm-dnsmasq-utils.c similarity index 100% rename from src/dnsmasq/nm-dnsmasq-utils.c rename to src/core/dnsmasq/nm-dnsmasq-utils.c diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/core/dnsmasq/nm-dnsmasq-utils.h similarity index 100% rename from src/dnsmasq/nm-dnsmasq-utils.h rename to src/core/dnsmasq/nm-dnsmasq-utils.h diff --git a/src/dnsmasq/tests/meson.build b/src/core/dnsmasq/tests/meson.build similarity index 100% rename from src/dnsmasq/tests/meson.build rename to src/core/dnsmasq/tests/meson.build diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/core/dnsmasq/tests/test-dnsmasq-utils.c similarity index 100% rename from src/dnsmasq/tests/test-dnsmasq-utils.c rename to src/core/dnsmasq/tests/test-dnsmasq-utils.c diff --git a/src/initrd/meson.build b/src/core/initrd/meson.build similarity index 100% rename from src/initrd/meson.build rename to src/core/initrd/meson.build diff --git a/src/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c similarity index 100% rename from src/initrd/nm-initrd-generator.c rename to src/core/initrd/nm-initrd-generator.c diff --git a/src/initrd/nm-initrd-generator.h b/src/core/initrd/nm-initrd-generator.h similarity index 100% rename from src/initrd/nm-initrd-generator.h rename to src/core/initrd/nm-initrd-generator.h diff --git a/src/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c similarity index 100% rename from src/initrd/nmi-cmdline-reader.c rename to src/core/initrd/nmi-cmdline-reader.c diff --git a/src/initrd/nmi-dt-reader.c b/src/core/initrd/nmi-dt-reader.c similarity index 100% rename from src/initrd/nmi-dt-reader.c rename to src/core/initrd/nmi-dt-reader.c diff --git a/src/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c similarity index 100% rename from src/initrd/nmi-ibft-reader.c rename to src/core/initrd/nmi-ibft-reader.c diff --git a/src/initrd/tests/meson.build b/src/core/initrd/tests/meson.build similarity index 100% rename from src/initrd/tests/meson.build rename to src/core/initrd/tests/meson.build diff --git a/src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address rename to src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address rename to src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address rename to src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address b/src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address rename to src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth0/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-dhcp/class/net/eth0/address rename to src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-dhcp/class/net/eth1/address b/src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address similarity index 100% rename from src/initrd/tests/sysfs-dhcp/class/net/eth1/address rename to src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port diff --git a/src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name similarity index 100% rename from src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name rename to src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name diff --git a/src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath similarity index 100% rename from src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath rename to src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address diff --git a/src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name b/src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name similarity index 100% rename from src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name rename to src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name diff --git a/src/initrd/tests/sysfs-static/class/net/eth0/address b/src/core/initrd/tests/sysfs-static/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-static/class/net/eth0/address rename to src/core/initrd/tests/sysfs-static/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-static/class/net/eth1/address b/src/core/initrd/tests/sysfs-static/class/net/eth1/address similarity index 100% rename from src/initrd/tests/sysfs-static/class/net/eth1/address rename to src/core/initrd/tests/sysfs-static/class/net/eth1/address diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan b/src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan rename to src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/index b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target1/index rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/lun b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target1/lun rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/port b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target1/port rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port diff --git a/src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name b/src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name similarity index 100% rename from src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name rename to src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name diff --git a/src/initrd/tests/sysfs-vlan/class/net/eth0/address b/src/core/initrd/tests/sysfs-vlan/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs-vlan/class/net/eth0/address rename to src/core/initrd/tests/sysfs-vlan/class/net/eth0/address diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name b/src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name similarity index 100% rename from src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name rename to src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name diff --git a/src/initrd/tests/sysfs/class/net/eth0/address b/src/core/initrd/tests/sysfs/class/net/eth0/address similarity index 100% rename from src/initrd/tests/sysfs/class/net/eth0/address rename to src/core/initrd/tests/sysfs/class/net/eth0/address diff --git a/src/initrd/tests/sysfs/class/net/eth2/address b/src/core/initrd/tests/sysfs/class/net/eth2/address similarity index 100% rename from src/initrd/tests/sysfs/class/net/eth2/address rename to src/core/initrd/tests/sysfs/class/net/eth2/address diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id rename to src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id rename to src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id diff --git a/src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature b/src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature rename to src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/index rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/index b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/index rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask diff --git a/src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan b/src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan rename to src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/flags b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/flags rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/index b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/index similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/index rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/index diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server diff --git a/src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server b/src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server rename to src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/chap-type rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target0/flags similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/flags rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/flags diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/index b/src/core/initrd/tests/sysfs/firmware/ibft/target0/index similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/index rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/index diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target0/lun similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/lun rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/lun diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc diff --git a/src/initrd/tests/sysfs/firmware/ibft/target0/port b/src/core/initrd/tests/sysfs/firmware/ibft/target0/port similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target0/port rename to src/core/initrd/tests/sysfs/firmware/ibft/target0/port diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/chap-type b/src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/chap-type rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/flags b/src/core/initrd/tests/sysfs/firmware/ibft/target2/flags similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/flags rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/flags diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/index b/src/core/initrd/tests/sysfs/firmware/ibft/target2/index similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/index rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/index diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr b/src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/lun b/src/core/initrd/tests/sysfs/firmware/ibft/target2/lun similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/lun rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/lun diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc b/src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/port b/src/core/initrd/tests/sysfs/firmware/ibft/target2/port similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/port rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/port diff --git a/src/initrd/tests/sysfs/firmware/ibft/target2/target-name b/src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name similarity index 100% rename from src/initrd/tests/sysfs/firmware/ibft/target2/target-name rename to src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c similarity index 100% rename from src/initrd/tests/test-cmdline-reader.c rename to src/core/initrd/tests/test-cmdline-reader.c diff --git a/src/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c similarity index 100% rename from src/initrd/tests/test-dt-reader.c rename to src/core/initrd/tests/test-dt-reader.c diff --git a/src/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c similarity index 100% rename from src/initrd/tests/test-ibft-reader.c rename to src/core/initrd/tests/test-ibft-reader.c diff --git a/src/main-utils.c b/src/core/main-utils.c similarity index 100% rename from src/main-utils.c rename to src/core/main-utils.c diff --git a/src/main-utils.h b/src/core/main-utils.h similarity index 100% rename from src/main-utils.h rename to src/core/main-utils.h diff --git a/src/main.c b/src/core/main.c similarity index 100% rename from src/main.c rename to src/core/main.c diff --git a/src/meson.build b/src/core/meson.build similarity index 100% rename from src/meson.build rename to src/core/meson.build diff --git a/src/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c similarity index 100% rename from src/ndisc/nm-fake-ndisc.c rename to src/core/ndisc/nm-fake-ndisc.c diff --git a/src/ndisc/nm-fake-ndisc.h b/src/core/ndisc/nm-fake-ndisc.h similarity index 100% rename from src/ndisc/nm-fake-ndisc.h rename to src/core/ndisc/nm-fake-ndisc.h diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c similarity index 100% rename from src/ndisc/nm-lndp-ndisc.c rename to src/core/ndisc/nm-lndp-ndisc.c diff --git a/src/ndisc/nm-lndp-ndisc.h b/src/core/ndisc/nm-lndp-ndisc.h similarity index 100% rename from src/ndisc/nm-lndp-ndisc.h rename to src/core/ndisc/nm-lndp-ndisc.h diff --git a/src/ndisc/nm-ndisc-private.h b/src/core/ndisc/nm-ndisc-private.h similarity index 100% rename from src/ndisc/nm-ndisc-private.h rename to src/core/ndisc/nm-ndisc-private.h diff --git a/src/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c similarity index 100% rename from src/ndisc/nm-ndisc.c rename to src/core/ndisc/nm-ndisc.c diff --git a/src/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h similarity index 100% rename from src/ndisc/nm-ndisc.h rename to src/core/ndisc/nm-ndisc.h diff --git a/src/ndisc/tests/meson.build b/src/core/ndisc/tests/meson.build similarity index 100% rename from src/ndisc/tests/meson.build rename to src/core/ndisc/tests/meson.build diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/core/ndisc/tests/test-ndisc-fake.c similarity index 100% rename from src/ndisc/tests/test-ndisc-fake.c rename to src/core/ndisc/tests/test-ndisc-fake.c diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c similarity index 100% rename from src/ndisc/tests/test-ndisc-linux.c rename to src/core/ndisc/tests/test-ndisc-linux.c diff --git a/src/nm-act-request.c b/src/core/nm-act-request.c similarity index 100% rename from src/nm-act-request.c rename to src/core/nm-act-request.c diff --git a/src/nm-act-request.h b/src/core/nm-act-request.h similarity index 100% rename from src/nm-act-request.h rename to src/core/nm-act-request.h diff --git a/src/nm-active-connection.c b/src/core/nm-active-connection.c similarity index 100% rename from src/nm-active-connection.c rename to src/core/nm-active-connection.c diff --git a/src/nm-active-connection.h b/src/core/nm-active-connection.h similarity index 100% rename from src/nm-active-connection.h rename to src/core/nm-active-connection.h diff --git a/src/nm-audit-manager.c b/src/core/nm-audit-manager.c similarity index 100% rename from src/nm-audit-manager.c rename to src/core/nm-audit-manager.c diff --git a/src/nm-audit-manager.h b/src/core/nm-audit-manager.h similarity index 100% rename from src/nm-audit-manager.h rename to src/core/nm-audit-manager.h diff --git a/src/nm-auth-manager.c b/src/core/nm-auth-manager.c similarity index 100% rename from src/nm-auth-manager.c rename to src/core/nm-auth-manager.c diff --git a/src/nm-auth-manager.h b/src/core/nm-auth-manager.h similarity index 100% rename from src/nm-auth-manager.h rename to src/core/nm-auth-manager.h diff --git a/src/nm-auth-utils.c b/src/core/nm-auth-utils.c similarity index 100% rename from src/nm-auth-utils.c rename to src/core/nm-auth-utils.c diff --git a/src/nm-auth-utils.h b/src/core/nm-auth-utils.h similarity index 100% rename from src/nm-auth-utils.h rename to src/core/nm-auth-utils.h diff --git a/src/nm-checkpoint-manager.c b/src/core/nm-checkpoint-manager.c similarity index 100% rename from src/nm-checkpoint-manager.c rename to src/core/nm-checkpoint-manager.c diff --git a/src/nm-checkpoint-manager.h b/src/core/nm-checkpoint-manager.h similarity index 100% rename from src/nm-checkpoint-manager.h rename to src/core/nm-checkpoint-manager.h diff --git a/src/nm-checkpoint.c b/src/core/nm-checkpoint.c similarity index 100% rename from src/nm-checkpoint.c rename to src/core/nm-checkpoint.c diff --git a/src/nm-checkpoint.h b/src/core/nm-checkpoint.h similarity index 100% rename from src/nm-checkpoint.h rename to src/core/nm-checkpoint.h diff --git a/src/nm-config-data.c b/src/core/nm-config-data.c similarity index 100% rename from src/nm-config-data.c rename to src/core/nm-config-data.c diff --git a/src/nm-config-data.h b/src/core/nm-config-data.h similarity index 100% rename from src/nm-config-data.h rename to src/core/nm-config-data.h diff --git a/src/nm-config.c b/src/core/nm-config.c similarity index 100% rename from src/nm-config.c rename to src/core/nm-config.c diff --git a/src/nm-config.h b/src/core/nm-config.h similarity index 100% rename from src/nm-config.h rename to src/core/nm-config.h diff --git a/src/nm-connectivity.c b/src/core/nm-connectivity.c similarity index 100% rename from src/nm-connectivity.c rename to src/core/nm-connectivity.c diff --git a/src/nm-connectivity.h b/src/core/nm-connectivity.h similarity index 100% rename from src/nm-connectivity.h rename to src/core/nm-connectivity.h diff --git a/src/nm-core-utils.c b/src/core/nm-core-utils.c similarity index 100% rename from src/nm-core-utils.c rename to src/core/nm-core-utils.c diff --git a/src/nm-core-utils.h b/src/core/nm-core-utils.h similarity index 100% rename from src/nm-core-utils.h rename to src/core/nm-core-utils.h diff --git a/src/nm-dbus-manager.c b/src/core/nm-dbus-manager.c similarity index 100% rename from src/nm-dbus-manager.c rename to src/core/nm-dbus-manager.c diff --git a/src/nm-dbus-manager.h b/src/core/nm-dbus-manager.h similarity index 100% rename from src/nm-dbus-manager.h rename to src/core/nm-dbus-manager.h diff --git a/src/nm-dbus-object.c b/src/core/nm-dbus-object.c similarity index 100% rename from src/nm-dbus-object.c rename to src/core/nm-dbus-object.c diff --git a/src/nm-dbus-object.h b/src/core/nm-dbus-object.h similarity index 100% rename from src/nm-dbus-object.h rename to src/core/nm-dbus-object.h diff --git a/src/nm-dbus-utils.c b/src/core/nm-dbus-utils.c similarity index 100% rename from src/nm-dbus-utils.c rename to src/core/nm-dbus-utils.c diff --git a/src/nm-dbus-utils.h b/src/core/nm-dbus-utils.h similarity index 100% rename from src/nm-dbus-utils.h rename to src/core/nm-dbus-utils.h diff --git a/src/nm-dcb.c b/src/core/nm-dcb.c similarity index 100% rename from src/nm-dcb.c rename to src/core/nm-dcb.c diff --git a/src/nm-dcb.h b/src/core/nm-dcb.h similarity index 100% rename from src/nm-dcb.h rename to src/core/nm-dcb.h diff --git a/src/nm-dhcp-config.c b/src/core/nm-dhcp-config.c similarity index 100% rename from src/nm-dhcp-config.c rename to src/core/nm-dhcp-config.c diff --git a/src/nm-dhcp-config.h b/src/core/nm-dhcp-config.h similarity index 100% rename from src/nm-dhcp-config.h rename to src/core/nm-dhcp-config.h diff --git a/src/nm-dispatcher.c b/src/core/nm-dispatcher.c similarity index 100% rename from src/nm-dispatcher.c rename to src/core/nm-dispatcher.c diff --git a/src/nm-dispatcher.h b/src/core/nm-dispatcher.h similarity index 100% rename from src/nm-dispatcher.h rename to src/core/nm-dispatcher.h diff --git a/src/nm-firewall-manager.c b/src/core/nm-firewall-manager.c similarity index 100% rename from src/nm-firewall-manager.c rename to src/core/nm-firewall-manager.c diff --git a/src/nm-firewall-manager.h b/src/core/nm-firewall-manager.h similarity index 100% rename from src/nm-firewall-manager.h rename to src/core/nm-firewall-manager.h diff --git a/src/nm-hostname-manager.c b/src/core/nm-hostname-manager.c similarity index 100% rename from src/nm-hostname-manager.c rename to src/core/nm-hostname-manager.c diff --git a/src/nm-hostname-manager.h b/src/core/nm-hostname-manager.h similarity index 100% rename from src/nm-hostname-manager.h rename to src/core/nm-hostname-manager.h diff --git a/src/nm-iface-helper.c b/src/core/nm-iface-helper.c similarity index 100% rename from src/nm-iface-helper.c rename to src/core/nm-iface-helper.c diff --git a/src/nm-ip-config.c b/src/core/nm-ip-config.c similarity index 100% rename from src/nm-ip-config.c rename to src/core/nm-ip-config.c diff --git a/src/nm-ip-config.h b/src/core/nm-ip-config.h similarity index 100% rename from src/nm-ip-config.h rename to src/core/nm-ip-config.h diff --git a/src/nm-ip4-config.c b/src/core/nm-ip4-config.c similarity index 100% rename from src/nm-ip4-config.c rename to src/core/nm-ip4-config.c diff --git a/src/nm-ip4-config.h b/src/core/nm-ip4-config.h similarity index 100% rename from src/nm-ip4-config.h rename to src/core/nm-ip4-config.h diff --git a/src/nm-ip6-config.c b/src/core/nm-ip6-config.c similarity index 100% rename from src/nm-ip6-config.c rename to src/core/nm-ip6-config.c diff --git a/src/nm-ip6-config.h b/src/core/nm-ip6-config.h similarity index 100% rename from src/nm-ip6-config.h rename to src/core/nm-ip6-config.h diff --git a/src/nm-keep-alive.c b/src/core/nm-keep-alive.c similarity index 100% rename from src/nm-keep-alive.c rename to src/core/nm-keep-alive.c diff --git a/src/nm-keep-alive.h b/src/core/nm-keep-alive.h similarity index 100% rename from src/nm-keep-alive.h rename to src/core/nm-keep-alive.h diff --git a/src/nm-l3-config-data.c b/src/core/nm-l3-config-data.c similarity index 100% rename from src/nm-l3-config-data.c rename to src/core/nm-l3-config-data.c diff --git a/src/nm-l3-config-data.h b/src/core/nm-l3-config-data.h similarity index 100% rename from src/nm-l3-config-data.h rename to src/core/nm-l3-config-data.h diff --git a/src/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c similarity index 100% rename from src/nm-l3-ipv4ll.c rename to src/core/nm-l3-ipv4ll.c diff --git a/src/nm-l3-ipv4ll.h b/src/core/nm-l3-ipv4ll.h similarity index 100% rename from src/nm-l3-ipv4ll.h rename to src/core/nm-l3-ipv4ll.h diff --git a/src/nm-l3cfg.c b/src/core/nm-l3cfg.c similarity index 100% rename from src/nm-l3cfg.c rename to src/core/nm-l3cfg.c diff --git a/src/nm-l3cfg.h b/src/core/nm-l3cfg.h similarity index 100% rename from src/nm-l3cfg.h rename to src/core/nm-l3cfg.h diff --git a/src/nm-manager.c b/src/core/nm-manager.c similarity index 100% rename from src/nm-manager.c rename to src/core/nm-manager.c diff --git a/src/nm-manager.h b/src/core/nm-manager.h similarity index 100% rename from src/nm-manager.h rename to src/core/nm-manager.h diff --git a/src/nm-netns.c b/src/core/nm-netns.c similarity index 100% rename from src/nm-netns.c rename to src/core/nm-netns.c diff --git a/src/nm-netns.h b/src/core/nm-netns.h similarity index 100% rename from src/nm-netns.h rename to src/core/nm-netns.h diff --git a/src/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c similarity index 100% rename from src/nm-pacrunner-manager.c rename to src/core/nm-pacrunner-manager.c diff --git a/src/nm-pacrunner-manager.h b/src/core/nm-pacrunner-manager.h similarity index 100% rename from src/nm-pacrunner-manager.h rename to src/core/nm-pacrunner-manager.h diff --git a/src/nm-policy.c b/src/core/nm-policy.c similarity index 100% rename from src/nm-policy.c rename to src/core/nm-policy.c diff --git a/src/nm-policy.h b/src/core/nm-policy.h similarity index 100% rename from src/nm-policy.h rename to src/core/nm-policy.h diff --git a/src/nm-proxy-config.c b/src/core/nm-proxy-config.c similarity index 100% rename from src/nm-proxy-config.c rename to src/core/nm-proxy-config.c diff --git a/src/nm-proxy-config.h b/src/core/nm-proxy-config.h similarity index 100% rename from src/nm-proxy-config.h rename to src/core/nm-proxy-config.h diff --git a/src/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c similarity index 100% rename from src/nm-rfkill-manager.c rename to src/core/nm-rfkill-manager.c diff --git a/src/nm-rfkill-manager.h b/src/core/nm-rfkill-manager.h similarity index 100% rename from src/nm-rfkill-manager.h rename to src/core/nm-rfkill-manager.h diff --git a/src/nm-session-monitor.c b/src/core/nm-session-monitor.c similarity index 100% rename from src/nm-session-monitor.c rename to src/core/nm-session-monitor.c diff --git a/src/nm-session-monitor.h b/src/core/nm-session-monitor.h similarity index 100% rename from src/nm-session-monitor.h rename to src/core/nm-session-monitor.h diff --git a/src/nm-sleep-monitor.c b/src/core/nm-sleep-monitor.c similarity index 100% rename from src/nm-sleep-monitor.c rename to src/core/nm-sleep-monitor.c diff --git a/src/nm-sleep-monitor.h b/src/core/nm-sleep-monitor.h similarity index 100% rename from src/nm-sleep-monitor.h rename to src/core/nm-sleep-monitor.h diff --git a/src/nm-test-utils-core.h b/src/core/nm-test-utils-core.h similarity index 100% rename from src/nm-test-utils-core.h rename to src/core/nm-test-utils-core.h diff --git a/src/nm-types.h b/src/core/nm-types.h similarity index 100% rename from src/nm-types.h rename to src/core/nm-types.h diff --git a/src/org.freedesktop.NetworkManager.conf b/src/core/org.freedesktop.NetworkManager.conf similarity index 100% rename from src/org.freedesktop.NetworkManager.conf rename to src/core/org.freedesktop.NetworkManager.conf diff --git a/src/platform/linux/nl802154.h b/src/core/platform/linux/nl802154.h similarity index 100% rename from src/platform/linux/nl802154.h rename to src/core/platform/linux/nl802154.h diff --git a/src/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c similarity index 100% rename from src/platform/nm-fake-platform.c rename to src/core/platform/nm-fake-platform.c diff --git a/src/platform/nm-fake-platform.h b/src/core/platform/nm-fake-platform.h similarity index 100% rename from src/platform/nm-fake-platform.h rename to src/core/platform/nm-fake-platform.h diff --git a/src/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c similarity index 100% rename from src/platform/nm-linux-platform.c rename to src/core/platform/nm-linux-platform.c diff --git a/src/platform/nm-linux-platform.h b/src/core/platform/nm-linux-platform.h similarity index 100% rename from src/platform/nm-linux-platform.h rename to src/core/platform/nm-linux-platform.h diff --git a/src/platform/nm-platform-private.h b/src/core/platform/nm-platform-private.h similarity index 100% rename from src/platform/nm-platform-private.h rename to src/core/platform/nm-platform-private.h diff --git a/src/platform/nm-platform.c b/src/core/platform/nm-platform.c similarity index 100% rename from src/platform/nm-platform.c rename to src/core/platform/nm-platform.c diff --git a/src/platform/nm-platform.h b/src/core/platform/nm-platform.h similarity index 100% rename from src/platform/nm-platform.h rename to src/core/platform/nm-platform.h diff --git a/src/platform/nmp-object.c b/src/core/platform/nmp-object.c similarity index 100% rename from src/platform/nmp-object.c rename to src/core/platform/nmp-object.c diff --git a/src/platform/nmp-object.h b/src/core/platform/nmp-object.h similarity index 100% rename from src/platform/nmp-object.h rename to src/core/platform/nmp-object.h diff --git a/src/platform/nmp-rules-manager.c b/src/core/platform/nmp-rules-manager.c similarity index 100% rename from src/platform/nmp-rules-manager.c rename to src/core/platform/nmp-rules-manager.c diff --git a/src/platform/nmp-rules-manager.h b/src/core/platform/nmp-rules-manager.h similarity index 100% rename from src/platform/nmp-rules-manager.h rename to src/core/platform/nmp-rules-manager.h diff --git a/src/platform/tests/meson.build b/src/core/platform/tests/meson.build similarity index 100% rename from src/platform/tests/meson.build rename to src/core/platform/tests/meson.build diff --git a/src/platform/tests/monitor.c b/src/core/platform/tests/monitor.c similarity index 100% rename from src/platform/tests/monitor.c rename to src/core/platform/tests/monitor.c diff --git a/src/platform/tests/test-address.c b/src/core/platform/tests/test-address.c similarity index 100% rename from src/platform/tests/test-address.c rename to src/core/platform/tests/test-address.c diff --git a/src/platform/tests/test-cleanup.c b/src/core/platform/tests/test-cleanup.c similarity index 100% rename from src/platform/tests/test-cleanup.c rename to src/core/platform/tests/test-cleanup.c diff --git a/src/platform/tests/test-common.c b/src/core/platform/tests/test-common.c similarity index 100% rename from src/platform/tests/test-common.c rename to src/core/platform/tests/test-common.c diff --git a/src/platform/tests/test-common.h b/src/core/platform/tests/test-common.h similarity index 100% rename from src/platform/tests/test-common.h rename to src/core/platform/tests/test-common.h diff --git a/src/platform/tests/test-link.c b/src/core/platform/tests/test-link.c similarity index 100% rename from src/platform/tests/test-link.c rename to src/core/platform/tests/test-link.c diff --git a/src/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c similarity index 100% rename from src/platform/tests/test-nmp-object.c rename to src/core/platform/tests/test-nmp-object.c diff --git a/src/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c similarity index 100% rename from src/platform/tests/test-platform-general.c rename to src/core/platform/tests/test-platform-general.c diff --git a/src/platform/tests/test-route.c b/src/core/platform/tests/test-route.c similarity index 100% rename from src/platform/tests/test-route.c rename to src/core/platform/tests/test-route.c diff --git a/src/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c similarity index 100% rename from src/platform/tests/test-tc.c rename to src/core/platform/tests/test-tc.c diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c similarity index 100% rename from src/platform/wifi/nm-wifi-utils-nl80211.c rename to src/core/platform/wifi/nm-wifi-utils-nl80211.c diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.h b/src/core/platform/wifi/nm-wifi-utils-nl80211.h similarity index 100% rename from src/platform/wifi/nm-wifi-utils-nl80211.h rename to src/core/platform/wifi/nm-wifi-utils-nl80211.h diff --git a/src/platform/wifi/nm-wifi-utils-private.h b/src/core/platform/wifi/nm-wifi-utils-private.h similarity index 100% rename from src/platform/wifi/nm-wifi-utils-private.h rename to src/core/platform/wifi/nm-wifi-utils-private.h diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c similarity index 100% rename from src/platform/wifi/nm-wifi-utils-wext.c rename to src/core/platform/wifi/nm-wifi-utils-wext.c diff --git a/src/platform/wifi/nm-wifi-utils-wext.h b/src/core/platform/wifi/nm-wifi-utils-wext.h similarity index 100% rename from src/platform/wifi/nm-wifi-utils-wext.h rename to src/core/platform/wifi/nm-wifi-utils-wext.h diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c similarity index 100% rename from src/platform/wifi/nm-wifi-utils.c rename to src/core/platform/wifi/nm-wifi-utils.c diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/core/platform/wifi/nm-wifi-utils.h similarity index 100% rename from src/platform/wifi/nm-wifi-utils.h rename to src/core/platform/wifi/nm-wifi-utils.h diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c similarity index 100% rename from src/platform/wpan/nm-wpan-utils.c rename to src/core/platform/wpan/nm-wpan-utils.c diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/core/platform/wpan/nm-wpan-utils.h similarity index 100% rename from src/platform/wpan/nm-wpan-utils.h rename to src/core/platform/wpan/nm-wpan-utils.h diff --git a/src/ppp/meson.build b/src/core/ppp/meson.build similarity index 100% rename from src/ppp/meson.build rename to src/core/ppp/meson.build diff --git a/src/ppp/nm-ppp-manager-call.c b/src/core/ppp/nm-ppp-manager-call.c similarity index 100% rename from src/ppp/nm-ppp-manager-call.c rename to src/core/ppp/nm-ppp-manager-call.c diff --git a/src/ppp/nm-ppp-manager-call.h b/src/core/ppp/nm-ppp-manager-call.h similarity index 100% rename from src/ppp/nm-ppp-manager-call.h rename to src/core/ppp/nm-ppp-manager-call.h diff --git a/src/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c similarity index 100% rename from src/ppp/nm-ppp-manager.c rename to src/core/ppp/nm-ppp-manager.c diff --git a/src/ppp/nm-ppp-manager.h b/src/core/ppp/nm-ppp-manager.h similarity index 100% rename from src/ppp/nm-ppp-manager.h rename to src/core/ppp/nm-ppp-manager.h diff --git a/src/ppp/nm-ppp-plugin-api.h b/src/core/ppp/nm-ppp-plugin-api.h similarity index 100% rename from src/ppp/nm-ppp-plugin-api.h rename to src/core/ppp/nm-ppp-plugin-api.h diff --git a/src/ppp/nm-ppp-plugin.ver b/src/core/ppp/nm-ppp-plugin.ver similarity index 100% rename from src/ppp/nm-ppp-plugin.ver rename to src/core/ppp/nm-ppp-plugin.ver diff --git a/src/ppp/nm-ppp-status.h b/src/core/ppp/nm-ppp-status.h similarity index 100% rename from src/ppp/nm-ppp-status.h rename to src/core/ppp/nm-ppp-status.h diff --git a/src/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c similarity index 100% rename from src/ppp/nm-pppd-plugin.c rename to src/core/ppp/nm-pppd-plugin.c diff --git a/src/ppp/nm-pppd-plugin.h b/src/core/ppp/nm-pppd-plugin.h similarity index 100% rename from src/ppp/nm-pppd-plugin.h rename to src/core/ppp/nm-pppd-plugin.h diff --git a/src/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c similarity index 100% rename from src/settings/nm-agent-manager.c rename to src/core/settings/nm-agent-manager.c diff --git a/src/settings/nm-agent-manager.h b/src/core/settings/nm-agent-manager.h similarity index 100% rename from src/settings/nm-agent-manager.h rename to src/core/settings/nm-agent-manager.h diff --git a/src/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c similarity index 100% rename from src/settings/nm-secret-agent.c rename to src/core/settings/nm-secret-agent.c diff --git a/src/settings/nm-secret-agent.h b/src/core/settings/nm-secret-agent.h similarity index 100% rename from src/settings/nm-secret-agent.h rename to src/core/settings/nm-secret-agent.h diff --git a/src/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c similarity index 100% rename from src/settings/nm-settings-connection.c rename to src/core/settings/nm-settings-connection.c diff --git a/src/settings/nm-settings-connection.h b/src/core/settings/nm-settings-connection.h similarity index 100% rename from src/settings/nm-settings-connection.h rename to src/core/settings/nm-settings-connection.h diff --git a/src/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c similarity index 100% rename from src/settings/nm-settings-plugin.c rename to src/core/settings/nm-settings-plugin.c diff --git a/src/settings/nm-settings-plugin.h b/src/core/settings/nm-settings-plugin.h similarity index 100% rename from src/settings/nm-settings-plugin.h rename to src/core/settings/nm-settings-plugin.h diff --git a/src/settings/nm-settings-storage.c b/src/core/settings/nm-settings-storage.c similarity index 100% rename from src/settings/nm-settings-storage.c rename to src/core/settings/nm-settings-storage.c diff --git a/src/settings/nm-settings-storage.h b/src/core/settings/nm-settings-storage.h similarity index 100% rename from src/settings/nm-settings-storage.h rename to src/core/settings/nm-settings-storage.h diff --git a/src/settings/nm-settings-utils.c b/src/core/settings/nm-settings-utils.c similarity index 100% rename from src/settings/nm-settings-utils.c rename to src/core/settings/nm-settings-utils.c diff --git a/src/settings/nm-settings-utils.h b/src/core/settings/nm-settings-utils.h similarity index 100% rename from src/settings/nm-settings-utils.h rename to src/core/settings/nm-settings-utils.h diff --git a/src/settings/nm-settings.c b/src/core/settings/nm-settings.c similarity index 100% rename from src/settings/nm-settings.c rename to src/core/settings/nm-settings.c diff --git a/src/settings/nm-settings.h b/src/core/settings/nm-settings.h similarity index 100% rename from src/settings/nm-settings.h rename to src/core/settings/nm-settings.h diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/core/settings/plugins/ifcfg-rh/meson.build similarity index 100% rename from src/settings/plugins/ifcfg-rh/meson.build rename to src/core/settings/plugins/ifcfg-rh/meson.build diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf similarity index 100% rename from src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf rename to src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml similarity index 100% rename from src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml rename to src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml diff --git a/src/settings/plugins/ifcfg-rh/nm-ifdown b/src/core/settings/plugins/ifcfg-rh/nm-ifdown similarity index 100% rename from src/settings/plugins/ifcfg-rh/nm-ifdown rename to src/core/settings/plugins/ifcfg-rh/nm-ifdown diff --git a/src/settings/plugins/ifcfg-rh/nm-ifup b/src/core/settings/plugins/ifcfg-rh/nm-ifup similarity index 100% rename from src/settings/plugins/ifcfg-rh/nm-ifup rename to src/core/settings/plugins/ifcfg-rh/nm-ifup diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h rename to src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c similarity index 100% rename from src/settings/plugins/ifcfg-rh/shvar.c rename to src/core/settings/plugins/ifcfg-rh/shvar.c diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/core/settings/plugins/ifcfg-rh/shvar.h similarity index 100% rename from src/settings/plugins/ifcfg-rh/shvar.h rename to src/core/settings/plugins/ifcfg-rh/shvar.h diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/core/settings/plugins/ifcfg-rh/tests/meson.build similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/meson.build rename to src/core/settings/plugins/ifcfg-rh/tests/meson.build diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 similarity index 100% rename from src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 rename to src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c similarity index 99% rename from src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c rename to src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 71f2d3e8c..10d498eda 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -49,8 +49,9 @@ #include "nm-test-utils-core.h" -#define TEST_IFCFG_DIR NM_BUILD_SRCDIR "/src/settings/plugins/ifcfg-rh/tests/network-scripts" -#define TEST_SCRATCH_DIR NM_BUILD_BUILDDIR "/src/settings/plugins/ifcfg-rh/tests/network-scripts" +#define TEST_IFCFG_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/ifcfg-rh/tests/network-scripts" +#define TEST_SCRATCH_DIR \ + NM_BUILD_BUILDDIR "/src/core/settings/plugins/ifcfg-rh/tests/network-scripts" #define TEST_SCRATCH_DIR_TMP TEST_SCRATCH_DIR "/tmp" #define TEST_SCRATCH_ALIAS_BASE TEST_SCRATCH_DIR "/ifcfg-alias0" diff --git a/src/settings/plugins/ifupdown/meson.build b/src/core/settings/plugins/ifupdown/meson.build similarity index 100% rename from src/settings/plugins/ifupdown/meson.build rename to src/core/settings/plugins/ifupdown/meson.build diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c rename to src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h rename to src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-parser.c rename to src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-parser.h rename to src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-plugin.c rename to src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h similarity index 100% rename from src/settings/plugins/ifupdown/nms-ifupdown-plugin.h rename to src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h diff --git a/src/settings/plugins/ifupdown/tests/meson.build b/src/core/settings/plugins/ifupdown/tests/meson.build similarity index 100% rename from src/settings/plugins/ifupdown/tests/meson.build rename to src/core/settings/plugins/ifupdown/tests/meson.build diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c similarity index 99% rename from src/settings/plugins/ifupdown/tests/test-ifupdown.c rename to src/core/settings/plugins/ifupdown/tests/test-ifupdown.c index e921cd5b0..c3c5bb543 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -12,7 +12,7 @@ #include "nm-test-utils-core.h" -#define TEST_DIR NM_BUILD_SRCDIR "/src/settings/plugins/ifupdown/tests" +#define TEST_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/ifupdown/tests" /*****************************************************************************/ diff --git a/src/settings/plugins/ifupdown/tests/test1 b/src/core/settings/plugins/ifupdown/tests/test1 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test1 rename to src/core/settings/plugins/ifupdown/tests/test1 diff --git a/src/settings/plugins/ifupdown/tests/test11 b/src/core/settings/plugins/ifupdown/tests/test11 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test11 rename to src/core/settings/plugins/ifupdown/tests/test11 diff --git a/src/settings/plugins/ifupdown/tests/test12 b/src/core/settings/plugins/ifupdown/tests/test12 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test12 rename to src/core/settings/plugins/ifupdown/tests/test12 diff --git a/src/settings/plugins/ifupdown/tests/test13 b/src/core/settings/plugins/ifupdown/tests/test13 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test13 rename to src/core/settings/plugins/ifupdown/tests/test13 diff --git a/src/settings/plugins/ifupdown/tests/test14 b/src/core/settings/plugins/ifupdown/tests/test14 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test14 rename to src/core/settings/plugins/ifupdown/tests/test14 diff --git a/src/settings/plugins/ifupdown/tests/test15 b/src/core/settings/plugins/ifupdown/tests/test15 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test15 rename to src/core/settings/plugins/ifupdown/tests/test15 diff --git a/src/settings/plugins/ifupdown/tests/test16 b/src/core/settings/plugins/ifupdown/tests/test16 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test16 rename to src/core/settings/plugins/ifupdown/tests/test16 diff --git a/src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 b/src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 rename to src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 diff --git a/src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 b/src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 rename to src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 diff --git a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen b/src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen similarity index 100% rename from src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen rename to src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen diff --git a/src/settings/plugins/ifupdown/tests/test2 b/src/core/settings/plugins/ifupdown/tests/test2 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test2 rename to src/core/settings/plugins/ifupdown/tests/test2 diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza similarity index 100% rename from src/settings/plugins/ifupdown/tests/test20-source-stanza rename to src/core/settings/plugins/ifupdown/tests/test20-source-stanza diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 rename to src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 diff --git a/src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 b/src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 rename to src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza similarity index 100% rename from src/settings/plugins/ifupdown/tests/test21-source-dir-stanza rename to src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza diff --git a/src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 b/src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 rename to src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d/test21-source-dir-stanza.eth0 diff --git a/src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas b/src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas similarity index 100% rename from src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas rename to src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas diff --git a/src/settings/plugins/ifupdown/tests/test3 b/src/core/settings/plugins/ifupdown/tests/test3 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test3 rename to src/core/settings/plugins/ifupdown/tests/test3 diff --git a/src/settings/plugins/ifupdown/tests/test4 b/src/core/settings/plugins/ifupdown/tests/test4 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test4 rename to src/core/settings/plugins/ifupdown/tests/test4 diff --git a/src/settings/plugins/ifupdown/tests/test5 b/src/core/settings/plugins/ifupdown/tests/test5 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test5 rename to src/core/settings/plugins/ifupdown/tests/test5 diff --git a/src/settings/plugins/ifupdown/tests/test6 b/src/core/settings/plugins/ifupdown/tests/test6 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test6 rename to src/core/settings/plugins/ifupdown/tests/test6 diff --git a/src/settings/plugins/ifupdown/tests/test7 b/src/core/settings/plugins/ifupdown/tests/test7 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test7 rename to src/core/settings/plugins/ifupdown/tests/test7 diff --git a/src/settings/plugins/ifupdown/tests/test8 b/src/core/settings/plugins/ifupdown/tests/test8 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test8 rename to src/core/settings/plugins/ifupdown/tests/test8 diff --git a/src/settings/plugins/ifupdown/tests/test9 b/src/core/settings/plugins/ifupdown/tests/test9 similarity index 100% rename from src/settings/plugins/ifupdown/tests/test9 rename to src/core/settings/plugins/ifupdown/tests/test9 diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-plugin.c rename to src/core/settings/plugins/keyfile/nms-keyfile-plugin.c diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.h b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.h similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-plugin.h rename to src/core/settings/plugins/keyfile/nms-keyfile-plugin.h diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-reader.c rename to src/core/settings/plugins/keyfile/nms-keyfile-reader.c diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.h b/src/core/settings/plugins/keyfile/nms-keyfile-reader.h similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-reader.h rename to src/core/settings/plugins/keyfile/nms-keyfile-reader.h diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.c b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-storage.c rename to src/core/settings/plugins/keyfile/nms-keyfile-storage.c diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.h b/src/core/settings/plugins/keyfile/nms-keyfile-storage.h similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-storage.h rename to src/core/settings/plugins/keyfile/nms-keyfile-storage.h diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-utils.c rename to src/core/settings/plugins/keyfile/nms-keyfile-utils.c diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/core/settings/plugins/keyfile/nms-keyfile-utils.h similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-utils.h rename to src/core/settings/plugins/keyfile/nms-keyfile-utils.h diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-writer.c rename to src/core/settings/plugins/keyfile/nms-keyfile-writer.c diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.h b/src/core/settings/plugins/keyfile/nms-keyfile-writer.h similarity index 100% rename from src/settings/plugins/keyfile/nms-keyfile-writer.h rename to src/core/settings/plugins/keyfile/nms-keyfile-writer.h diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT rename to src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT diff --git a/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain b/src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain rename to src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 rename to src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem rename to src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem diff --git a/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem b/src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem similarity index 100% rename from src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem rename to src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/core/settings/plugins/keyfile/tests/meson.build similarity index 100% rename from src/settings/plugins/keyfile/tests/meson.build rename to src/core/settings/plugins/keyfile/tests/meson.build diff --git a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c similarity index 99% rename from src/settings/plugins/keyfile/tests/test-keyfile-settings.c rename to src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index 9dbfba1c5..4d9c86c3d 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -23,8 +23,8 @@ #include "nm-test-utils-core.h" -#define TEST_KEYFILES_DIR NM_BUILD_SRCDIR "/src/settings/plugins/keyfile/tests/keyfiles" -#define TEST_SCRATCH_DIR NM_BUILD_BUILDDIR "/src/settings/plugins/keyfile/tests/keyfiles" +#define TEST_KEYFILES_DIR NM_BUILD_SRCDIR "/src/core/settings/plugins/keyfile/tests/keyfiles" +#define TEST_SCRATCH_DIR NM_BUILD_BUILDDIR "/src/core/settings/plugins/keyfile/tests/keyfiles" /*****************************************************************************/ diff --git a/src/settings/plugins/meson.build b/src/core/settings/plugins/meson.build similarity index 100% rename from src/settings/plugins/meson.build rename to src/core/settings/plugins/meson.build diff --git a/src/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c similarity index 100% rename from src/supplicant/nm-supplicant-config.c rename to src/core/supplicant/nm-supplicant-config.c diff --git a/src/supplicant/nm-supplicant-config.h b/src/core/supplicant/nm-supplicant-config.h similarity index 100% rename from src/supplicant/nm-supplicant-config.h rename to src/core/supplicant/nm-supplicant-config.h diff --git a/src/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c similarity index 100% rename from src/supplicant/nm-supplicant-interface.c rename to src/core/supplicant/nm-supplicant-interface.c diff --git a/src/supplicant/nm-supplicant-interface.h b/src/core/supplicant/nm-supplicant-interface.h similarity index 100% rename from src/supplicant/nm-supplicant-interface.h rename to src/core/supplicant/nm-supplicant-interface.h diff --git a/src/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c similarity index 100% rename from src/supplicant/nm-supplicant-manager.c rename to src/core/supplicant/nm-supplicant-manager.c diff --git a/src/supplicant/nm-supplicant-manager.h b/src/core/supplicant/nm-supplicant-manager.h similarity index 100% rename from src/supplicant/nm-supplicant-manager.h rename to src/core/supplicant/nm-supplicant-manager.h diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c similarity index 100% rename from src/supplicant/nm-supplicant-settings-verify.c rename to src/core/supplicant/nm-supplicant-settings-verify.c diff --git a/src/supplicant/nm-supplicant-settings-verify.h b/src/core/supplicant/nm-supplicant-settings-verify.h similarity index 100% rename from src/supplicant/nm-supplicant-settings-verify.h rename to src/core/supplicant/nm-supplicant-settings-verify.h diff --git a/src/supplicant/nm-supplicant-types.h b/src/core/supplicant/nm-supplicant-types.h similarity index 100% rename from src/supplicant/nm-supplicant-types.h rename to src/core/supplicant/nm-supplicant-types.h diff --git a/src/supplicant/tests/certs/test-ca-cert.pem b/src/core/supplicant/tests/certs/test-ca-cert.pem similarity index 100% rename from src/supplicant/tests/certs/test-ca-cert.pem rename to src/core/supplicant/tests/certs/test-ca-cert.pem diff --git a/src/supplicant/tests/certs/test-cert.p12 b/src/core/supplicant/tests/certs/test-cert.p12 similarity index 100% rename from src/supplicant/tests/certs/test-cert.p12 rename to src/core/supplicant/tests/certs/test-cert.p12 diff --git a/src/supplicant/tests/meson.build b/src/core/supplicant/tests/meson.build similarity index 100% rename from src/supplicant/tests/meson.build rename to src/core/supplicant/tests/meson.build diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c similarity index 99% rename from src/supplicant/tests/test-supplicant-config.c rename to src/core/supplicant/tests/test-supplicant-config.c index 4918ae03c..1dde90bd1 100644 --- a/src/supplicant/tests/test-supplicant-config.c +++ b/src/core/supplicant/tests/test-supplicant-config.c @@ -21,7 +21,7 @@ #include "nm-test-utils-core.h" -#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/supplicant/tests/certs" +#define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/core/supplicant/tests/certs" /*****************************************************************************/ diff --git a/src/systemd/meson.build b/src/core/systemd/meson.build similarity index 100% rename from src/systemd/meson.build rename to src/core/systemd/meson.build diff --git a/src/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c similarity index 100% rename from src/systemd/nm-sd-utils-core.c rename to src/core/systemd/nm-sd-utils-core.c diff --git a/src/systemd/nm-sd-utils-core.h b/src/core/systemd/nm-sd-utils-core.h similarity index 100% rename from src/systemd/nm-sd-utils-core.h rename to src/core/systemd/nm-sd-utils-core.h diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/core/systemd/nm-sd-utils-dhcp.c similarity index 100% rename from src/systemd/nm-sd-utils-dhcp.c rename to src/core/systemd/nm-sd-utils-dhcp.c diff --git a/src/systemd/nm-sd-utils-dhcp.h b/src/core/systemd/nm-sd-utils-dhcp.h similarity index 100% rename from src/systemd/nm-sd-utils-dhcp.h rename to src/core/systemd/nm-sd-utils-dhcp.h diff --git a/src/systemd/nm-sd.c b/src/core/systemd/nm-sd.c similarity index 100% rename from src/systemd/nm-sd.c rename to src/core/systemd/nm-sd.c diff --git a/src/systemd/nm-sd.h b/src/core/systemd/nm-sd.h similarity index 100% rename from src/systemd/nm-sd.h rename to src/core/systemd/nm-sd.h diff --git a/src/systemd/sd-adapt-core/condition.h b/src/core/systemd/sd-adapt-core/condition.h similarity index 100% rename from src/systemd/sd-adapt-core/condition.h rename to src/core/systemd/sd-adapt-core/condition.h diff --git a/src/systemd/sd-adapt-core/conf-parser.h b/src/core/systemd/sd-adapt-core/conf-parser.h similarity index 100% rename from src/systemd/sd-adapt-core/conf-parser.h rename to src/core/systemd/sd-adapt-core/conf-parser.h diff --git a/src/systemd/sd-adapt-core/device-util.h b/src/core/systemd/sd-adapt-core/device-util.h similarity index 100% rename from src/systemd/sd-adapt-core/device-util.h rename to src/core/systemd/sd-adapt-core/device-util.h diff --git a/src/systemd/sd-adapt-core/khash.h b/src/core/systemd/sd-adapt-core/khash.h similarity index 100% rename from src/systemd/sd-adapt-core/khash.h rename to src/core/systemd/sd-adapt-core/khash.h diff --git a/src/systemd/sd-adapt-core/network-util.h b/src/core/systemd/sd-adapt-core/network-util.h similarity index 100% rename from src/systemd/sd-adapt-core/network-util.h rename to src/core/systemd/sd-adapt-core/network-util.h diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c similarity index 100% rename from src/systemd/sd-adapt-core/nm-sd-adapt-core.c rename to src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h similarity index 100% rename from src/systemd/sd-adapt-core/nm-sd-adapt-core.h rename to src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h diff --git a/src/systemd/sd-adapt-core/sd-daemon.h b/src/core/systemd/sd-adapt-core/sd-daemon.h similarity index 100% rename from src/systemd/sd-adapt-core/sd-daemon.h rename to src/core/systemd/sd-adapt-core/sd-daemon.h diff --git a/src/systemd/sd-adapt-core/sd-device.h b/src/core/systemd/sd-adapt-core/sd-device.h similarity index 100% rename from src/systemd/sd-adapt-core/sd-device.h rename to src/core/systemd/sd-adapt-core/sd-device.h diff --git a/src/systemd/sd-adapt-core/udev-util.h b/src/core/systemd/sd-adapt-core/udev-util.h similarity index 100% rename from src/systemd/sd-adapt-core/udev-util.h rename to src/core/systemd/sd-adapt-core/udev-util.h diff --git a/src/systemd/src/libsystemd-network/arp-util.c b/src/core/systemd/src/libsystemd-network/arp-util.c similarity index 100% rename from src/systemd/src/libsystemd-network/arp-util.c rename to src/core/systemd/src/libsystemd-network/arp-util.c diff --git a/src/systemd/src/libsystemd-network/arp-util.h b/src/core/systemd/src/libsystemd-network/arp-util.h similarity index 100% rename from src/systemd/src/libsystemd-network/arp-util.h rename to src/core/systemd/src/libsystemd-network/arp-util.h diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/core/systemd/src/libsystemd-network/dhcp-identifier.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-identifier.c rename to src/core/systemd/src/libsystemd-network/dhcp-identifier.c diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.h b/src/core/systemd/src/libsystemd-network/dhcp-identifier.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-identifier.h rename to src/core/systemd/src/libsystemd-network/dhcp-identifier.h diff --git a/src/systemd/src/libsystemd-network/dhcp-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-internal.h rename to src/core/systemd/src/libsystemd-network/dhcp-internal.h diff --git a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-lease-internal.h rename to src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h diff --git a/src/systemd/src/libsystemd-network/dhcp-network.c b/src/core/systemd/src/libsystemd-network/dhcp-network.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-network.c rename to src/core/systemd/src/libsystemd-network/dhcp-network.c diff --git a/src/systemd/src/libsystemd-network/dhcp-option.c b/src/core/systemd/src/libsystemd-network/dhcp-option.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-option.c rename to src/core/systemd/src/libsystemd-network/dhcp-option.c diff --git a/src/systemd/src/libsystemd-network/dhcp-packet.c b/src/core/systemd/src/libsystemd-network/dhcp-packet.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-packet.c rename to src/core/systemd/src/libsystemd-network/dhcp-packet.c diff --git a/src/systemd/src/libsystemd-network/dhcp-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp-protocol.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp-protocol.h rename to src/core/systemd/src/libsystemd-network/dhcp-protocol.h diff --git a/src/systemd/src/libsystemd-network/dhcp6-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp6-internal.h rename to src/core/systemd/src/libsystemd-network/dhcp6-internal.h diff --git a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp6-lease-internal.h rename to src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h diff --git a/src/systemd/src/libsystemd-network/dhcp6-network.c b/src/core/systemd/src/libsystemd-network/dhcp6-network.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp6-network.c rename to src/core/systemd/src/libsystemd-network/dhcp6-network.c diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/core/systemd/src/libsystemd-network/dhcp6-option.c similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp6-option.c rename to src/core/systemd/src/libsystemd-network/dhcp6-option.c diff --git a/src/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/core/systemd/src/libsystemd-network/dhcp6-protocol.h similarity index 100% rename from src/systemd/src/libsystemd-network/dhcp6-protocol.h rename to src/core/systemd/src/libsystemd-network/dhcp6-protocol.h diff --git a/src/systemd/src/libsystemd-network/lldp-internal.h b/src/core/systemd/src/libsystemd-network/lldp-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/lldp-internal.h rename to src/core/systemd/src/libsystemd-network/lldp-internal.h diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.c b/src/core/systemd/src/libsystemd-network/lldp-neighbor.c similarity index 100% rename from src/systemd/src/libsystemd-network/lldp-neighbor.c rename to src/core/systemd/src/libsystemd-network/lldp-neighbor.c diff --git a/src/systemd/src/libsystemd-network/lldp-neighbor.h b/src/core/systemd/src/libsystemd-network/lldp-neighbor.h similarity index 100% rename from src/systemd/src/libsystemd-network/lldp-neighbor.h rename to src/core/systemd/src/libsystemd-network/lldp-neighbor.h diff --git a/src/systemd/src/libsystemd-network/lldp-network.c b/src/core/systemd/src/libsystemd-network/lldp-network.c similarity index 100% rename from src/systemd/src/libsystemd-network/lldp-network.c rename to src/core/systemd/src/libsystemd-network/lldp-network.c diff --git a/src/systemd/src/libsystemd-network/lldp-network.h b/src/core/systemd/src/libsystemd-network/lldp-network.h similarity index 100% rename from src/systemd/src/libsystemd-network/lldp-network.h rename to src/core/systemd/src/libsystemd-network/lldp-network.h diff --git a/src/systemd/src/libsystemd-network/network-internal.c b/src/core/systemd/src/libsystemd-network/network-internal.c similarity index 100% rename from src/systemd/src/libsystemd-network/network-internal.c rename to src/core/systemd/src/libsystemd-network/network-internal.c diff --git a/src/systemd/src/libsystemd-network/network-internal.h b/src/core/systemd/src/libsystemd-network/network-internal.h similarity index 100% rename from src/systemd/src/libsystemd-network/network-internal.h rename to src/core/systemd/src/libsystemd-network/network-internal.h diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-client.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-dhcp-client.c rename to src/core/systemd/src/libsystemd-network/sd-dhcp-client.c diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-dhcp-lease.c rename to src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-dhcp6-client.c rename to src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-dhcp6-lease.c rename to src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c diff --git a/src/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/core/systemd/src/libsystemd-network/sd-ipv4acd.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-ipv4acd.c rename to src/core/systemd/src/libsystemd-network/sd-ipv4acd.c diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/core/systemd/src/libsystemd-network/sd-ipv4ll.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-ipv4ll.c rename to src/core/systemd/src/libsystemd-network/sd-ipv4ll.c diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/core/systemd/src/libsystemd-network/sd-lldp.c similarity index 100% rename from src/systemd/src/libsystemd-network/sd-lldp.c rename to src/core/systemd/src/libsystemd-network/sd-lldp.c diff --git a/src/systemd/src/libsystemd/sd-event/event-source.h b/src/core/systemd/src/libsystemd/sd-event/event-source.h similarity index 100% rename from src/systemd/src/libsystemd/sd-event/event-source.h rename to src/core/systemd/src/libsystemd/sd-event/event-source.h diff --git a/src/systemd/src/libsystemd/sd-event/event-util.c b/src/core/systemd/src/libsystemd/sd-event/event-util.c similarity index 100% rename from src/systemd/src/libsystemd/sd-event/event-util.c rename to src/core/systemd/src/libsystemd/sd-event/event-util.c diff --git a/src/systemd/src/libsystemd/sd-event/event-util.h b/src/core/systemd/src/libsystemd/sd-event/event-util.h similarity index 100% rename from src/systemd/src/libsystemd/sd-event/event-util.h rename to src/core/systemd/src/libsystemd/sd-event/event-util.h diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/core/systemd/src/libsystemd/sd-event/sd-event.c similarity index 100% rename from src/systemd/src/libsystemd/sd-event/sd-event.c rename to src/core/systemd/src/libsystemd/sd-event/sd-event.c diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.c b/src/core/systemd/src/libsystemd/sd-id128/id128-util.c similarity index 100% rename from src/systemd/src/libsystemd/sd-id128/id128-util.c rename to src/core/systemd/src/libsystemd/sd-id128/id128-util.c diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.h b/src/core/systemd/src/libsystemd/sd-id128/id128-util.h similarity index 100% rename from src/systemd/src/libsystemd/sd-id128/id128-util.h rename to src/core/systemd/src/libsystemd/sd-id128/id128-util.h diff --git a/src/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/core/systemd/src/libsystemd/sd-id128/sd-id128.c similarity index 100% rename from src/systemd/src/libsystemd/sd-id128/sd-id128.c rename to src/core/systemd/src/libsystemd/sd-id128/sd-id128.c diff --git a/src/systemd/src/systemd/_sd-common.h b/src/core/systemd/src/systemd/_sd-common.h similarity index 100% rename from src/systemd/src/systemd/_sd-common.h rename to src/core/systemd/src/systemd/_sd-common.h diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/core/systemd/src/systemd/sd-dhcp-client.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp-client.h rename to src/core/systemd/src/systemd/sd-dhcp-client.h diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/core/systemd/src/systemd/sd-dhcp-lease.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp-lease.h rename to src/core/systemd/src/systemd/sd-dhcp-lease.h diff --git a/src/systemd/src/systemd/sd-dhcp-option.h b/src/core/systemd/src/systemd/sd-dhcp-option.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp-option.h rename to src/core/systemd/src/systemd/sd-dhcp-option.h diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/core/systemd/src/systemd/sd-dhcp6-client.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp6-client.h rename to src/core/systemd/src/systemd/sd-dhcp6-client.h diff --git a/src/systemd/src/systemd/sd-dhcp6-lease.h b/src/core/systemd/src/systemd/sd-dhcp6-lease.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp6-lease.h rename to src/core/systemd/src/systemd/sd-dhcp6-lease.h diff --git a/src/systemd/src/systemd/sd-dhcp6-option.h b/src/core/systemd/src/systemd/sd-dhcp6-option.h similarity index 100% rename from src/systemd/src/systemd/sd-dhcp6-option.h rename to src/core/systemd/src/systemd/sd-dhcp6-option.h diff --git a/src/systemd/src/systemd/sd-event.h b/src/core/systemd/src/systemd/sd-event.h similarity index 100% rename from src/systemd/src/systemd/sd-event.h rename to src/core/systemd/src/systemd/sd-event.h diff --git a/src/systemd/src/systemd/sd-id128.h b/src/core/systemd/src/systemd/sd-id128.h similarity index 100% rename from src/systemd/src/systemd/sd-id128.h rename to src/core/systemd/src/systemd/sd-id128.h diff --git a/src/systemd/src/systemd/sd-ipv4acd.h b/src/core/systemd/src/systemd/sd-ipv4acd.h similarity index 100% rename from src/systemd/src/systemd/sd-ipv4acd.h rename to src/core/systemd/src/systemd/sd-ipv4acd.h diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/core/systemd/src/systemd/sd-ipv4ll.h similarity index 100% rename from src/systemd/src/systemd/sd-ipv4ll.h rename to src/core/systemd/src/systemd/sd-ipv4ll.h diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/core/systemd/src/systemd/sd-lldp.h similarity index 100% rename from src/systemd/src/systemd/sd-lldp.h rename to src/core/systemd/src/systemd/sd-lldp.h diff --git a/src/systemd/src/systemd/sd-ndisc.h b/src/core/systemd/src/systemd/sd-ndisc.h similarity index 100% rename from src/systemd/src/systemd/sd-ndisc.h rename to src/core/systemd/src/systemd/sd-ndisc.h diff --git a/src/tests/config/NetworkManager-warn.conf b/src/core/tests/config/NetworkManager-warn.conf similarity index 100% rename from src/tests/config/NetworkManager-warn.conf rename to src/core/tests/config/NetworkManager-warn.conf diff --git a/src/tests/config/NetworkManager.conf b/src/core/tests/config/NetworkManager.conf similarity index 100% rename from src/tests/config/NetworkManager.conf rename to src/core/tests/config/NetworkManager.conf diff --git a/src/tests/config/NetworkManager.state b/src/core/tests/config/NetworkManager.state similarity index 100% rename from src/tests/config/NetworkManager.state rename to src/core/tests/config/NetworkManager.state diff --git a/src/tests/config/bad.conf b/src/core/tests/config/bad.conf similarity index 100% rename from src/tests/config/bad.conf rename to src/core/tests/config/bad.conf diff --git a/src/tests/config/conf.d/00-overrides.conf b/src/core/tests/config/conf.d/00-overrides.conf similarity index 100% rename from src/tests/config/conf.d/00-overrides.conf rename to src/core/tests/config/conf.d/00-overrides.conf diff --git a/src/tests/config/conf.d/10-more.conf b/src/core/tests/config/conf.d/10-more.conf similarity index 100% rename from src/tests/config/conf.d/10-more.conf rename to src/core/tests/config/conf.d/10-more.conf diff --git a/src/tests/config/conf.d/20-config-enable-1.conf b/src/core/tests/config/conf.d/20-config-enable-1.conf similarity index 100% rename from src/tests/config/conf.d/20-config-enable-1.conf rename to src/core/tests/config/conf.d/20-config-enable-1.conf diff --git a/src/tests/config/conf.d/90-last.conf b/src/core/tests/config/conf.d/90-last.conf similarity index 100% rename from src/tests/config/conf.d/90-last.conf rename to src/core/tests/config/conf.d/90-last.conf diff --git a/src/tests/config/global-dns-invalid.conf b/src/core/tests/config/global-dns-invalid.conf similarity index 100% rename from src/tests/config/global-dns-invalid.conf rename to src/core/tests/config/global-dns-invalid.conf diff --git a/src/tests/config/meson.build b/src/core/tests/config/meson.build similarity index 100% rename from src/tests/config/meson.build rename to src/core/tests/config/meson.build diff --git a/src/tests/config/nm-test-device.c b/src/core/tests/config/nm-test-device.c similarity index 100% rename from src/tests/config/nm-test-device.c rename to src/core/tests/config/nm-test-device.c diff --git a/src/tests/config/nm-test-device.h b/src/core/tests/config/nm-test-device.h similarity index 100% rename from src/tests/config/nm-test-device.h rename to src/core/tests/config/nm-test-device.h diff --git a/src/tests/config/test-config.c b/src/core/tests/config/test-config.c similarity index 99% rename from src/tests/config/test-config.c rename to src/core/tests/config/test-config.c index 15a4340b7..526c71385 100644 --- a/src/tests/config/test-config.c +++ b/src/core/tests/config/test-config.c @@ -16,8 +16,8 @@ #include "nm-test-utils-core.h" -#define TEST_DIR NM_BUILD_SRCDIR "/src/tests/config" -#define BUILD_DIR NM_BUILD_BUILDDIR "/src/tests/config" +#define TEST_DIR NM_BUILD_SRCDIR "/src/core/tests/config" +#define BUILD_DIR NM_BUILD_BUILDDIR "/src/core/tests/config" /*****************************************************************************/ diff --git a/src/tests/meson.build b/src/core/tests/meson.build similarity index 100% rename from src/tests/meson.build rename to src/core/tests/meson.build diff --git a/src/tests/test-core-with-expect.c b/src/core/tests/test-core-with-expect.c similarity index 100% rename from src/tests/test-core-with-expect.c rename to src/core/tests/test-core-with-expect.c diff --git a/src/tests/test-core.c b/src/core/tests/test-core.c similarity index 100% rename from src/tests/test-core.c rename to src/core/tests/test-core.c diff --git a/src/tests/test-dcb.c b/src/core/tests/test-dcb.c similarity index 100% rename from src/tests/test-dcb.c rename to src/core/tests/test-dcb.c diff --git a/src/tests/test-ip4-config.c b/src/core/tests/test-ip4-config.c similarity index 100% rename from src/tests/test-ip4-config.c rename to src/core/tests/test-ip4-config.c diff --git a/src/tests/test-ip6-config.c b/src/core/tests/test-ip6-config.c similarity index 100% rename from src/tests/test-ip6-config.c rename to src/core/tests/test-ip6-config.c diff --git a/src/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c similarity index 100% rename from src/tests/test-l3cfg.c rename to src/core/tests/test-l3cfg.c diff --git a/src/tests/test-secret-agent.py b/src/core/tests/test-secret-agent.py similarity index 100% rename from src/tests/test-secret-agent.py rename to src/core/tests/test-secret-agent.py diff --git a/src/tests/test-systemd.c b/src/core/tests/test-systemd.c similarity index 100% rename from src/tests/test-systemd.c rename to src/core/tests/test-systemd.c diff --git a/src/tests/test-utils.c b/src/core/tests/test-utils.c similarity index 100% rename from src/tests/test-utils.c rename to src/core/tests/test-utils.c diff --git a/src/tests/test-wired-defname.c b/src/core/tests/test-wired-defname.c similarity index 100% rename from src/tests/test-wired-defname.c rename to src/core/tests/test-wired-defname.c diff --git a/src/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c similarity index 100% rename from src/vpn/nm-vpn-connection.c rename to src/core/vpn/nm-vpn-connection.c diff --git a/src/vpn/nm-vpn-connection.h b/src/core/vpn/nm-vpn-connection.h similarity index 100% rename from src/vpn/nm-vpn-connection.h rename to src/core/vpn/nm-vpn-connection.h diff --git a/src/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c similarity index 100% rename from src/vpn/nm-vpn-manager.c rename to src/core/vpn/nm-vpn-manager.c diff --git a/src/vpn/nm-vpn-manager.h b/src/core/vpn/nm-vpn-manager.h similarity index 100% rename from src/vpn/nm-vpn-manager.h rename to src/core/vpn/nm-vpn-manager.h diff --git a/tools/check-config-options.sh b/tools/check-config-options.sh index d9d4431ee..4cbd48559 100755 --- a/tools/check-config-options.sh +++ b/tools/check-config-options.sh @@ -5,20 +5,20 @@ ret=0 get_supported_options() { - awk '/START OPTION LIST/{flag=1;next}/END OPTION LIST/{flag=0}flag' "$srcdir/src/nm-config.c" | + awk '/START OPTION LIST/{flag=1;next}/END OPTION LIST/{flag=0}flag' "$srcdir/src/core/nm-config.c" | grep -o 'NM_CONFIG_KEYFILE_KEY_\w*' } get_missing_options() { - grep -v '/\* check-config-options skip \*/' "$srcdir/src/nm-config.h" | + grep -v '/\* check-config-options skip \*/' "$srcdir/src/core/nm-config.h" | grep -o 'NM_CONFIG_KEYFILE_KEY_\w*' | grep -v -Fx -f <(get_supported_options) } get_src_con_defaults() { - sed -n 's/\/dev/null); do + (for f in $(find ./src/core/settings/plugins/*/${libs} \ + ./src/core/devices/*/${libs} \ + ./src/core/ppp/${libs} -name '*.so' 2>/dev/null); do call_nm "$f" | sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|nmtst_\|c_siphash_\|c_list_\).*\)$/\2/p' done) | @@ -82,7 +82,7 @@ do_rebuild() { } do_update() { - do_generate > ./src/NetworkManager.ver + do_generate > ./src/core/NetworkManager.ver } SYMBOLS_MISSING="$(get_symbols_missing | pretty)" @@ -110,7 +110,7 @@ else libs=.libs/ fi -test -f ./src/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree" +test -f ./src/core/${libs}libNetworkManager.a || die "must be called from NetworkManager top build dir after building the tree" case "$1" in rebuild) @@ -125,8 +125,8 @@ case "$1" in if test -z "${NM_BUILD_NO_CREATE_EXPORTS+x}"; then do_update else - if test -f "./src/NetworkManager.ver"; then - touch ./src/NetworkManager.ver + if test -f "./src/core/NetworkManager.ver"; then + touch ./src/core/NetworkManager.ver fi fi ;; diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index ef9d4a61c..6d835a8fb 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -45,9 +45,9 @@ usage() { echo " With \"--test\" and \"--\" you can select the test and which arguments are" echo " passed to the test. You can omit these, in which case the first unknown parameter" echo " is the test and all other unknown parameters are passed to the test. For example" - echo " $0 -m --test src/tests/test-core -- -p /general/match-spec/device" + echo " $0 -m --test src/core/tests/test-core -- -p /general/match-spec/device" echo " can also be called as" - echo " $0 src/tests/test-core -p /general/match-spec/device -m" + echo " $0 src/core/tests/test-core -p /general/match-spec/device -m" echo "" echo " The following environment variables are honored:" echo " NMTST_USE_VALGRIND=0|1: enable/disable valgrind" diff --git a/tools/test-build.sh b/tools/test-build.sh index 17bcba7d1..0ae9a5862 100755 --- a/tools/test-build.sh +++ b/tools/test-build.sh @@ -31,15 +31,15 @@ build_out_of_tree() { TARGETS=("$@") if [ "${#TARGETS}" -lt 1 ]; then TARGETS=( - src/NetworkManager - src/nm-iface-helper - src/dhcp/nm-dhcp-helper + src/core/NetworkManager + src/core/nm-iface-helper + src/core/dhcp/nm-dhcp-helper dispatcher/nm-dispatcher clients/nm-online clients/cli/nmcli clients/tui/nmtui - src/platform/tests/monitor - src/ndisc/tests/test-ndisc-linux + src/core/platform/tests/monitor + src/core/ndisc/tests/test-ndisc-linux $(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$') ) fi