Merge pull request #598 from mtomaschewski/netif-requires

nanny: add device references to policy match (bsc#941611)

Author: mtomaschewski

client/ifup.c

@@ -73,6 +73,93 @@ __ni_ifup_generate_match_dev(xml_node_t *node, ni_ifworker_t *w)
 	return xml_node_new_element(NI_NANNY_IFPOLICY_MATCH_DEV, node, w->name);
 }
 
+static ni_bool_t
+__ni_ifup_generate_match_link_port_ref(xml_node_t *match, xml_node_t *port)
+{
+	const char *type = xml_node_get_attr(port, NI_CLIENT_IFCONFIG_PORT_TYPE);
+	ni_iftype_t ptype = ni_linktype_name_to_type(type);
+	xml_node_t *ref, *ovsbr;
+
+	switch (ptype) {
+	case NI_IFTYPE_OVS_BRIDGE:
+		ovsbr = xml_node_get_child(port, NI_CLIENT_IFCONFIG_BRIDGE);
+		if (!ovsbr || ni_string_empty(ovsbr->cdata))
+			return FALSE;
+
+		if (!(ref = xml_node_new(NI_NANNY_IFPOLICY_MATCH_REF, match)))
+			return FALSE;
+
+		if (!xml_node_new_element(NI_NANNY_IFPOLICY_MATCH_DEV, ref, ovsbr->cdata)) {
+			xml_node_free(ref);
+			return FALSE;
+		}
+		break;
+
+	default:
+		/* other port types need master only */
+		break;
+	}
+	return TRUE;
+}
+
+static ni_bool_t
+__ni_ifup_generate_match_link_ref(xml_node_t *match, xml_node_t *link)
+{
+	xml_node_t *ref, *master, *port;
+
+	if (!(master = xml_node_get_child(link, NI_CLIENT_IFCONFIG_MASTER)))
+		return TRUE; /* <link> does not contain a <master> node */
+
+	if (ni_string_empty(master->cdata))
+		return FALSE;
+
+	if (!(ref = xml_node_new(NI_NANNY_IFPOLICY_MATCH_REF, match)))
+		return FALSE;
+
+	if (!xml_node_new_element(NI_NANNY_IFPOLICY_MATCH_DEV, ref, master->cdata)) {
+		xml_node_free(ref);
+		return FALSE;
+	}
+
+	if ((port = xml_node_get_child(link, NI_CLIENT_IFCONFIG_LINK_PORT)))
+		return __ni_ifup_generate_match_link_port_ref(match, port);
+
+	return TRUE; /* master ref at least */
+}
+
+static ni_bool_t
+__ni_ifup_generate_match_master_ref(xml_node_t *match, ni_ifworker_t *master)
+{
+	xml_node_t *ref;
+
+	if (!master || ni_string_empty(master->name))
+		return FALSE;
+
+	if (!(ref = xml_node_new(NI_NANNY_IFPOLICY_MATCH_REF, match)))
+		return FALSE;
+
+	if (!xml_node_new_element(NI_NANNY_IFPOLICY_MATCH_DEV, ref, master->name)) {
+		xml_node_free(ref);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static ni_bool_t
+__ni_ifup_generate_match_refs(xml_node_t *match, ni_ifworker_t *w)
+{
+	xml_node_t *link;
+
+	if (w->masterdev)
+		return __ni_ifup_generate_match_master_ref(match, w->masterdev);
+
+	if ((link = xml_node_get_child(w->config.node, NI_CLIENT_IFCONFIG_LINK)))
+		return __ni_ifup_generate_match_link_ref(match, link);
+
+	return TRUE; /* no refs is not an error */
+}
+
 static xml_node_t *
 __ni_ifup_generate_match(const char *name, ni_ifworker_t *w)
 {
@@ -81,18 +168,34 @@ __ni_ifup_generate_match(const char *name, ni_ifworker_t *w)
 	if (!(match = xml_node_new(name, NULL)))
 		goto error;
 
+	ni_debug_wicked_xml(w->config.node, NI_LOG_DEBUG,
+		"generate policy match for %s (type %s)", w->name,
+		ni_linktype_type_to_name(w->iftype));
+
 	if (!__ni_ifup_generate_match_dev(match, w))
 		goto error;
 
-	/* Ignore child dependency for following device types */
+	/* Ignore child dependency for following device types:
+	 *  - ovs-system: otherwise ovs-system would require all ports
+	 *    in all ovs-bridges and want to get at least one up ...
+	 *    this is not what we want :-)
+	 */
 	switch (w->iftype) {
 	case NI_IFTYPE_OVS_SYSTEM:
 		goto done;
 		break;
 	default:
+		if (ni_string_eq(w->name, ni_linktype_type_to_name(NI_IFTYPE_OVS_SYSTEM)))
+			goto done;
 		break;
 	}
 
+	if (!__ni_ifup_generate_match_refs(match, w)) {
+		ni_debug_application("%s: unable to generate policy match device references",
+				w->name);
+		goto error;
+	}
+
 	if (w->children.count) {
 		xml_node_t *or;
 		unsigned int i;

include/wicked/fsm.h

@@ -287,9 +287,9 @@ extern void			ni_fsm_policy_free(ni_fsm_policy_t *);
 extern ni_bool_t		ni_fsm_policy_update(ni_fsm_policy_t *, xml_node_t *);
 extern ni_fsm_policy_t *	ni_fsm_policy_by_name(ni_fsm_t *, const char *);
 extern ni_bool_t		ni_fsm_policy_remove(ni_fsm_t *, ni_fsm_policy_t *);
-extern unsigned int		ni_fsm_policy_get_applicable_policies(ni_fsm_t *, ni_ifworker_t *,
+extern unsigned int		ni_fsm_policy_get_applicable_policies(const ni_fsm_t *, ni_ifworker_t *,
 						const ni_fsm_policy_t **, unsigned int);
-extern ni_bool_t		ni_fsm_exists_applicable_policy(ni_fsm_policy_t *, ni_ifworker_t *);
+extern ni_bool_t		ni_fsm_exists_applicable_policy(const ni_fsm_t *, ni_fsm_policy_t *, ni_ifworker_t *);
 extern xml_node_t *		ni_fsm_policy_transform_document(xml_node_t *, ni_fsm_policy_t * const *, unsigned int);
 extern const char *		ni_fsm_policy_name(const ni_fsm_policy_t *);
 extern xml_location_t *	ni_fsm_policy_location(const ni_fsm_policy_t *);
@@ -313,7 +313,7 @@ extern unsigned int		ni_fsm_fail_count(ni_fsm_t *);
 extern ni_ifworker_t *		ni_fsm_ifworker_by_object_path(ni_fsm_t *, const char *);
 extern ni_ifworker_t *		ni_fsm_ifworker_by_ifindex(ni_fsm_t *, unsigned int);
 extern ni_ifworker_t *		ni_fsm_ifworker_by_netdev(ni_fsm_t *, const ni_netdev_t *);
-extern ni_ifworker_t *		ni_fsm_ifworker_by_name(ni_fsm_t *, ni_ifworker_type_t, const char *);
+extern ni_ifworker_t *		ni_fsm_ifworker_by_name(const ni_fsm_t *, ni_ifworker_type_t, const char *);
 extern ni_ifworker_t *		ni_fsm_ifworker_by_policy_name(ni_fsm_t *, ni_ifworker_type_t, const char *);
 extern ni_ifworker_t *		ni_fsm_recv_new_netif(ni_fsm_t *fsm, ni_dbus_object_t *object, ni_bool_t refresh);
 extern ni_ifworker_t *		ni_fsm_recv_new_netif_path(ni_fsm_t *fsm, const char *path);

nanny/nanny.c

@@ -530,7 +530,7 @@ ni_nanny_register_device(ni_nanny_t *mgr, ni_ifworker_t *w)
 			mdev->allowed? ", user control allowed" : "",
 			mdev->monitor? ", monitored (auto-enabled)" : "");
 
-	if (ni_fsm_exists_applicable_policy(mgr->fsm->policies, w))
+	if (ni_fsm_exists_applicable_policy(mgr->fsm, mgr->fsm->policies, w))
 		ni_nanny_schedule_recheck(&mgr->recheck, w);
 
 	ni_ifworker_set_progress_callback(w, ni_managed_device_progress, mdev);
@@ -556,7 +556,7 @@ ni_nanny_unregister_device(ni_nanny_t *mgr, ni_ifworker_t *w)
 	ni_ifworker_set_completion_callback(w, NULL, NULL);
 
 	if (!ni_ifworker_is_factory_device(w) ||
-	    !ni_fsm_exists_applicable_policy(mgr->fsm->policies, w)) {
+	    !ni_fsm_exists_applicable_policy(mgr->fsm, mgr->fsm->policies, w)) {
 		ni_nanny_unschedule(&mgr->recheck, w);
 	}
 }

src/client/ifconfig.h

@@ -31,6 +31,9 @@
 #define NI_CLIENT_IFCONFIG_MODE		"mode"
 #define NI_CLIENT_IFCONFIG_LINK		"link"
 #define NI_CLIENT_IFCONFIG_MASTER		"master"
+#define NI_CLIENT_IFCONFIG_LINK_PORT		"port"
+#define NI_CLIENT_IFCONFIG_PORT_TYPE			"type"
+#define NI_CLIENT_IFCONFIG_BRIDGE	"bridge"
 #define NI_CLIENT_IFCONFIG_IPV4		"ipv4"
 #define NI_CLIENT_IFCONFIG_IPV6		"ipv6"
 #define NI_CLIENT_IFCONFIG_IP_ENABLED		"enabled"
@@ -45,6 +48,7 @@
 #define NI_NANNY_IFPOLICY_MATCH_COND_CHILD	"child"
 #define NI_NANNY_IFPOLICY_MATCH_ALWAYS_TRUE	"any"
 #define NI_NANNY_IFPOLICY_MATCH_DEV		"device"
+#define NI_NANNY_IFPOLICY_MATCH_REF		"reference"
 #define NI_NANNY_IFPOLICY_MATCH_MIN_STATE	"minimum-device-state"
 #define NI_NANNY_IFPOLICY_MATCH_LINK_TYPE	"link-type"
 #define NI_NANNY_IFPOLICY_MERGE		"merge"