Drop unused legacy/compat API (#262)

Libnetplan at out latest version 0.103 did not expose several symbols that we carry along (and would newly introduce as "legacy"/"compat" symbols in 0.104). This is due to the fact that the Makefile changed and those functions had been linked directly into the generate binary before, whereas they are now part of libnetplan.so. As those symbols have not been part of the library before, we should not introduce them now as legacy symbols, as no consumer can be using it from the old library.

COMMITS:
* openvswitch: make use of new netplan_netdef_write_network_file() API
* abi_compat: drop legacy API that has never been part of the library

Author: slyon

src/abi_compat.c

@@ -82,124 +82,6 @@ netplan_clear_netdefs()
     netplan_parser_reset(&global_parser);
     return n;
 }
-
-// LCOV_EXCL_START
-NETPLAN_INTERNAL void
-write_network_file(const NetplanNetDefinition* def, const char* rootdir, const char* path)
-{
-    GError* error = NULL;
-    if (!netplan_netdef_write_network_file(&global_state, def, rootdir, path, NULL, &error))
-    {
-        g_fprintf(stderr, "%s", error->message);
-        exit(1);
-    }
-}
-
-/**
- * Generate networkd configuration in @rootdir/run/systemd/network/ from the
- * parsed #netdefs.
- * @rootdir: If not %NULL, generate configuration in this root directory
- *           (useful for testing).
- * Returns: TRUE if @def applies to networkd, FALSE otherwise.
- */
-gboolean
-write_networkd_conf(const NetplanNetDefinition* def, const char* rootdir)
-{
-    GError* error = NULL;
-    gboolean has_been_written;
-    if (!netplan_netdef_write_networkd(&global_state, def, rootdir, &has_been_written, &error))
-    {
-        g_fprintf(stderr, "%s", error->message);
-        exit(1);
-    }
-    return has_been_written;
-}
-
-NETPLAN_INTERNAL void
-cleanup_networkd_conf(const char* rootdir)
-{
-    netplan_networkd_cleanup(rootdir);
-}
-
-// There only for compatibility purposes, the proper implementation is now directly
-// in the `generate` binary.
-NETPLAN_ABI void
-enable_networkd(const char* generator_dir)
-{
-    g_autofree char* link = g_build_path(G_DIR_SEPARATOR_S, generator_dir, "multi-user.target.wants", "systemd-networkd.service", NULL);
-    g_debug("We created networkd configuration, adding %s enablement symlink", link);
-    safe_mkdir_p_dir(link);
-    if (symlink("../systemd-networkd.service", link) < 0 && errno != EEXIST) {
-        g_fprintf(stderr, "failed to create enablement symlink: %m\n");
-        exit(1);
-    }
-
-    g_autofree char* link2 = g_build_path(G_DIR_SEPARATOR_S, generator_dir, "network-online.target.wants", "systemd-networkd-wait-online.service", NULL);
-    safe_mkdir_p_dir(link2);
-    if (symlink("/lib/systemd/system/systemd-networkd-wait-online.service", link2) < 0 && errno != EEXIST) {
-        g_fprintf(stderr, "failed to create enablement symlink: %m\n");
-        exit(1);
-    }
-}
-
-NETPLAN_INTERNAL void
-write_nm_conf(NetplanNetDefinition* def, const char* rootdir)
-{
-    GError* error = NULL;
-    if (!netplan_netdef_write_nm(&global_state, def, rootdir, NULL, &error)) {
-        g_fprintf(stderr, "%s", error->message);
-        exit(1);
-    }
-}
-
-NETPLAN_INTERNAL void
-write_nm_conf_finish(const char* rootdir)
-{
-    /* Original implementation had no error possible!! */
-    g_assert(netplan_state_finish_nm_write(&global_state, rootdir, NULL));
-}
-
-NETPLAN_INTERNAL void
-cleanup_nm_conf(const char* rootdir)
-{
-    netplan_nm_cleanup(rootdir);
-}
-
-NETPLAN_INTERNAL void
-write_ovs_conf(const NetplanNetDefinition* def, const char* rootdir)
-{
-    GError* error = NULL;
-    if (!netplan_netdef_write_ovs(&global_state, def, rootdir, NULL, &error)) {
-        g_fprintf(stderr, "%s", error->message);
-        exit(1);
-    }
-}
-
-NETPLAN_INTERNAL void
-write_ovs_conf_finish(const char* rootdir)
-{
-    /* Original implementation had no error possible!! */
-    g_assert(netplan_state_finish_ovs_write(&global_state, rootdir, NULL));
-}
-
-NETPLAN_INTERNAL void
-cleanup_ovs_conf(const char* rootdir)
-{
-    netplan_ovs_cleanup(rootdir);
-}
-
-NETPLAN_INTERNAL void
-write_sriov_conf_finish(const char* rootdir)
-{
-    /* Original implementation had no error possible!! */
-    g_assert(netplan_state_finish_sriov_write(&global_state, rootdir, NULL));
-}
-
-NETPLAN_INTERNAL void
-cleanup_sriov_conf(const char* rootdir)
-{
-    netplan_sriov_cleanup(rootdir);
-}
 // LCOV_EXCL_STOP
 
 gboolean

src/netplan.c

@@ -1003,8 +1003,3 @@ netplan_state_dump_yaml(const NetplanState* np_state, int out_fd, GError** error
 
     return netplan_netdef_list_write_yaml(np_state, np_state->netdefs_ordered, out_fd, error);
 }
-
-/* XXX: implement the following functions, once needed:
-void write_netplan_conf_finish(const char* rootdir)
-void cleanup_netplan_conf(const char* rootdir)
-*/

src/networkd.h

@@ -39,11 +39,3 @@ netplan_netdef_write_network_file(
 
 NETPLAN_INTERNAL void
 netplan_networkd_cleanup(const char* rootdir);
-
-/* Deprecated API */
-NETPLAN_INTERNAL gboolean
-write_networkd_conf(const NetplanNetDefinition* def, const char* rootdir);
-NETPLAN_INTERNAL void
-write_network_file(const NetplanNetDefinition* def, const char* rootdir, const char* path);
-NETPLAN_INTERNAL void
-cleanup_networkd_conf(const char* rootdir);

src/nm.h

@@ -35,11 +35,3 @@ netplan_state_finish_nm_write(
 
 NETPLAN_INTERNAL gboolean
 netplan_nm_cleanup(const char* rootdir);
-
-/* Deprecated API */
-NETPLAN_INTERNAL void
-write_nm_conf(NetplanNetDefinition* def, const char* rootdir);
-NETPLAN_INTERNAL void
-write_nm_conf_finish(const char* rootdir);
-NETPLAN_INTERNAL void
-cleanup_nm_conf(const char* rootdir);

src/openvswitch.c

@@ -413,7 +413,8 @@ netplan_netdef_write_ovs(const NetplanState* np_state, const NetplanNetDefinitio
 
         /* Try writing out a base config */
         base_config_path = g_strjoin(NULL, "run/systemd/network/10-netplan-", def->id, NULL);
-        write_network_file(def, rootdir, base_config_path);
+        if (!netplan_netdef_write_network_file(np_state, def, rootdir, base_config_path, has_been_written, error))
+            return FALSE;
     } else {
         /* Other interfaces must be part of an OVS bridge or bond to carry additional data */
         if (   (def->ovs_settings.external_ids && g_hash_table_size(def->ovs_settings.external_ids) > 0)

src/openvswitch.h

@@ -35,11 +35,3 @@ netplan_state_finish_ovs_write(
 
 NETPLAN_INTERNAL gboolean
 netplan_ovs_cleanup(const char* rootdir);
-
-/* Deprecated API */
-NETPLAN_INTERNAL void
-write_ovs_conf(const NetplanNetDefinition* def, const char* rootdir);
-NETPLAN_INTERNAL void
-write_ovs_conf_finish(const char* rootdir);
-NETPLAN_INTERNAL void
-cleanup_ovs_conf(const char* rootdir);

src/sriov.h

@@ -26,9 +26,3 @@ netplan_state_finish_sriov_write(
 
 NETPLAN_INTERNAL gboolean
 netplan_sriov_cleanup(const char* rootdir);
-
-/* Deprecated API */
-NETPLAN_INTERNAL void
-write_sriov_conf_finish(const char* rootdir);
-NETPLAN_INTERNAL void
-cleanup_sriov_conf(const char* rootdir);

tests/generator/test_ovs.py

@@ -1019,3 +1019,14 @@ def test_bridge_non_ovs_bond(self):
                               'Bond=non-ovs-bond'),
                               'ovs-br.network': ND_EMPTY % ('ovs-br', 'ipv6'),
                               'non-ovs-bond.netdev': '[NetDev]\nName=non-ovs-bond\nKind=bond\n'})
+
+    def test_ovs_invalid_networkd_config(self):
+        err = self.generate('''network:
+  version: 2
+  bridges:
+    br0:
+      openvswitch: {}
+      ipv6-address-generation: stable-privacy
+''', expect_fail=True)
+        self.assert_ovs({'cleanup.service': OVS_CLEANUP % {'iface': 'cleanup'}})
+        self.assertIn('br0: ipv6-address-generation mode is not supported by networkd', err)