parse-nm: account for veth and dummy when checking for virtual types

The new types DUMMY and VETH were added after the generic type NM. We it
checked if the interfaces was virtual, in order to build the netdef id,
it wouldn't consider DUMMY and VETH.

Because of that, when a dummy or veth interface is created via network
manager, it's netdef ID would be the connection UUID. For virtual
devices we want it to be the interface name.

include/types.h

@@ -65,6 +65,7 @@ typedef enum {
      * requires links to another netdef (such as vlan_link)
      * but it's not strictly mandatory
      * It's intended to be used only when renderer is NetworkManager
+     * Keep the PLACEHOLDER_ and MAX_ elements at the end of the enum
      */
     NETPLAN_DEF_TYPE_NM_PLACEHOLDER_,
     NETPLAN_DEF_TYPE_MAX_

src/parse-nm.c

@@ -668,7 +668,9 @@ netplan_parser_load_keyfile(NetplanParser* npp, const char* filename, GError** e
         nd_id = g_strdup(netdef_id);
         if (g_strcmp0(netdef_id, tmp_str) == 0)
             _kf_clear_key(kf, "connection", "interface-name");
-    } else if (tmp_str && nd_type >= NETPLAN_DEF_TYPE_VIRTUAL && nd_type < NETPLAN_DEF_TYPE_NM) {
+    } else if (tmp_str && nd_type != NETPLAN_DEF_TYPE_NM
+                && nd_type >= NETPLAN_DEF_TYPE_VIRTUAL
+                && nd_type < NETPLAN_DEF_TYPE_NM_PLACEHOLDER_) {
         /* netdef ID equals "interface-name" for virtual devices (bridge/bond/...) */
         nd_id = g_strdup(tmp_str);
         _kf_clear_key(kf, "connection", "interface-name");