Fixups

Author: mattiaswal

src/confd/src/core.c

@@ -269,7 +269,7 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	REGISTER_CHANGE(confd.session, "ietf-routing", "//.",
 			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
 
-	REGISTER_CHANGE(confd.session, "ietf-hardware", "//",
+	REGISTER_CHANGE(confd.session, "ietf-hardware", "//.",
 			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
 	REGISTER_CHANGE(confd.session, "infix-firewall", "//.",
 			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);

src/confd/src/ietf-routing.c

@@ -247,15 +247,16 @@ static int parse_static_routes(sr_session_ctx_t *session, struct lyd_node *paren
 int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd)
 {
 	int staticd_enabled = 0, ospfd_enabled = 0, bfdd_enabled = 0;
+	struct lyd_node *cplane, *cplanes;
 	bool ospfd_running, bfdd_running;
-	struct lyd_node *cplane, *tmp;
 	bool restart_zebra = false;
 	int rc = SR_ERR_OK;
 	FILE *fp;
 
-	if (!lydx_get_xpathf(diff, "/ietf-routing:routing/control-plane-protocols"))
+	if (!lydx_get_xpathf(diff, "/ietf-routing:routing"))
 		return SR_ERR_OK;
 
+	ERROR("Now setting up routing");
 	switch (event) {
 	case SR_EV_ENABLED: /* first time, on register. */
 	case SR_EV_CHANGE: /* regular change (copy cand running) */
@@ -352,16 +353,15 @@ int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, stru
 		return SR_ERR_OK;
 	}
 
-	LY_LIST_FOR(lyd_child(config), tmp) {
-		LY_LIST_FOR(lyd_child(tmp), cplane) {
-			const char *type;
+	cplanes = lydx_get_descendant(config, "routing", "control-plane-protocols", "control-plane-protocol", NULL);
+	LYX_LIST_FOR_EACH(cplanes, cplane, "control-plane-protocol") {
+		const char *type;
 
-			type = lydx_get_cattr(cplane, "type");
-			if (!strcmp(type, "infix-routing:static")) {
-				staticd_enabled = parse_static_routes(session, lydx_get_child(cplane, "static-routes"), fp);
-			} else if (!strcmp(type, "infix-routing:ospfv2")) {
-				parse_ospf(session, lydx_get_child(cplane, "ospf"));
-			}
+		type = lydx_get_cattr(cplane, "type");
+		if (!strcmp(type, "infix-routing:static")) {
+			staticd_enabled = parse_static_routes(session, lydx_get_child(cplane, "static-routes"), fp);
+		} else if (!strcmp(type, "infix-routing:ospfv2")) {
+			parse_ospf(session, lydx_get_child(cplane, "ospf"));
 		}
 	}