Refactor

Author: mattiaswal

src/confd/src/core.c

@@ -76,19 +76,6 @@ int core_post_hook(sr_session_ctx_t *session, uint32_t sub_id, const char *modul
 		return SR_ERR_SYS;
 	}
 
-	/* skip reload in bootstrap, implicit reload in runlevel change */
-	if (systemf("runlevel >/dev/null 2>&1")) {
-		/* trigger any tasks waiting for confd to have applied *-config */
-		system("initctl -nbq cond set bootstrap");
-		return SR_ERR_OK;
-	}
-
-	if (systemf("initctl -b reload")) {
-		EMERG("initctl reload: failed applying new configuration!");
-		return SR_ERR_SYS;
-	}
-
-	AUDIT("The new configuration has been applied.");
 
 	return SR_ERR_OK;
 }
@@ -215,40 +202,29 @@ static confd_dependency_t handle_dependencies(struct lyd_node **diff, struct lyd
 static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module_name,
 		     const char *xpath, sr_event_t event, uint32_t request_id, void *_confd)
 {
-<<<<<<< HEAD
-      struct confd *confd = _confd;
-      char *output = NULL;
-      struct lyd_node *diff = NULL, *config = NULL;
-      sr_data_t *cfg = NULL;
-      confd_dependency_t result;
-      int rc = SR_ERR_OK;
-      static uint32_t last_id = 0;
-      static uint32_t last_event = -1;
+	struct lyd_node *diff = NULL, *config = NULL;
+	static uint32_t last_event = -1;
+	struct confd *confd = _confd;
+	static uint32_t last_id = 0;
+	confd_dependency_t result;
+	sr_data_t *cfg = NULL;
+	int rc = SR_ERR_OK;
 	int max_dep = 10;
 
-      if (request_id == last_id && last_event == event)
-	      return SR_ERR_OK;
-      last_id = request_id;
-      last_event = event;
-
-      if (event == SR_EV_CHANGE || event == SR_EV_DONE) {
-	      rc = srx_get_diff(session, &diff);
-	      if (rc != SR_ERR_OK) {
-		      ERROR("Failed to get diff: %d", rc);
-		      return rc;
-	      }
-	      rc = sr_get_data(session, "//.", 0, 0, 0, &cfg);
-	      if (rc || !cfg)
-		      goto free_diff;
-
-	      config = cfg->tree;
-      }
-      while ((result = handle_dependencies(&diff, config)) != CONFD_DEP_DONE) {
-	      if (result == CONFD_DEP_ERROR) {
-		      ERROR("Failed to add dependencies");
-		      break;
-	      }
-      }
+	if (request_id == last_id && last_event == event)
+		return SR_ERR_OK;
+	last_id = request_id;
+	last_event = event;
+
+	if (event == SR_EV_CHANGE || event == SR_EV_DONE) {
+		rc = srx_get_diff(session, &diff);
+		if (rc != SR_ERR_OK) {
+			ERROR("Failed to get diff: %d", rc);
+			return rc;
+		}
+		rc = sr_get_data(session, "//.", 0, 0, 0, &cfg);
+		if (rc || !cfg)
+			goto free_diff;
 
 		config = cfg->tree;
 		while ((result = handle_dependencies(&diff, config)) != CONFD_DEP_DONE) {
@@ -271,46 +247,66 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
 		}
 #endif
 	}
-      /* ietf-interfaces */
-      ietf_interfaces_change(session, config, diff, event, confd);
 
-      /* infix-dhcp-client*/
-      infix_dhcp_client_change(session, config, diff, event, confd);
+	/* ietf-interfaces */
+	ietf_interfaces_change(session, config, diff, event, confd);
+
+	/* infix-dhcp-client*/
+	infix_dhcp_client_change(session, config, diff, event, confd);
+
+	/* ietf-keystore */
+	ietf_keystore_change(session, config, diff, event, confd);
 
-      /* ietf-keystore */
-      ietf_keystore_change(session, config, diff, event, confd);
+	/* infix-services */
+	infix_services_change(session, config, diff, event, confd);
 
-      /* infix-services */
-      infix_services_change(session, config, diff, event, confd);
+	/* ietf-syslog*/
+	ietf_syslog_change(session, config, diff, event, confd);
 
-      /* ietf-syslog*/
-      ietf_syslog_change(session, config, diff, event, confd);
+	/* ietf-system */
+	ietf_system_change(session, config, diff, event, confd);
 
-      /* ietf-system */
-      ietf_system_change(session, config, diff, event, confd);
+	/* infix-containers */
+	infix_containers_change(session, config, diff, event, confd);
 
-      /* infix-containers */
-      infix_containers_change(session, config, diff, event, confd);
+	/* ietf-hardware */
+	ietf_hardware_change(session, config, diff, event, confd);
 
-      /* ietf-hardware */
-      ietf_hardware_change(session, config, diff, event, confd);
+	/* ietf-routing */
+	ietf_routing_change(session, config, diff, event, confd);
 
-      /* ietf-routing */
-      ietf_routing_change(session, config, diff, event, confd);
+	/* infix-dhcp-server */
+	infix_dhcp_server_change(session, config, diff, event, confd);
 
-      /* infix-dhcp-server */
-      infix_dhcp_server_change(session, config, diff, event, confd);
+	/* infix-firewall */
+	infix_firewall_change(session, config, diff, event, confd);
 
-      /* infix-firewall */
-      infix_firewall_change(session, config, diff, event, confd);
+	if (cfg)
+		sr_release_data(cfg);
+
+	if (event == SR_EV_DONE) {
+		/* skip reload in bootstrap, implicit reload in runlevel change */
+		if (systemf("runlevel >/dev/null 2>&1")) {
+			/* trigger any tasks waiting for confd to have applied *-config */
+			system("initctl -nbq cond set bootstrap");
+			return SR_ERR_OK;
+		}
 
-      if (cfg)
-	      sr_release_data(cfg);
+		if (systemf("initctl -b reload")) {
+			EMERG("initctl reload: failed applying new configuration!");
+			return SR_ERR_SYS;
+		}
+
+		AUDIT("The new configuration has been applied.");
+	}
 free_diff:
       lyd_free_tree(diff);
       return rc;
-  }
+}
 
+static int subscribe_module(char *model, struct confd *confd, int flags) {
+	return sr_module_change_subscribe(confd->session, model, "//.", change_cb, confd, CB_PRIO_PRIMARY, SR_SUBSCR_CHANGE_ALL_MODULES | SR_SUBSCR_DEFAULT | flags, &confd->sub);
+}
 
 int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 {
@@ -356,78 +352,120 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	 */
 	confd.ifquirks = json_load_file("/etc/product/interface-quirks.json", 0, NULL);
 
-	REGISTER_CHANGE(confd.session, "ietf-interfaces", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "infix-dhcp-client", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "ietf-keystore", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "ietf-syslog", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "infix-services", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "ietf-system", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-	REGISTER_CHANGE(confd.session, "ieee802-dot1ab-lldp", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
+	rc = subscribe_module("ietf-interfaces", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-interfaces");
+		goto err;
+	}
+	rc = subscribe_module("ietf-netconf-acm", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-netconf-acm");
+		goto err;
+	}
+	rc = subscribe_module("infix-dhcp-client", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-dhcp-client");
+		goto err;
+	}
+	rc = subscribe_module("ietf-keystore", &confd, SR_SUBSCR_UPDATE);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-keystore");
+		goto err;
+	}
+	rc = subscribe_module("infix-services", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-services");
+		goto err;
+	}
+	rc = subscribe_module("ietf-system", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-system");
+		goto err;
+	}
+	rc = subscribe_module("ieee802-dot1ab-lldp", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ieee802-dot1ab-lldp");
+		goto err;
+	}
 #ifdef CONTAINERS
-	REGISTER_CHANGE(confd.session, "infix-containers", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
+	rc = subscribe_module("infix-containers", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-containers");
+		goto err;
+	}
 #endif
-	REGISTER_CHANGE(confd.session, "infix-dhcp-server", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-
-	REGISTER_CHANGE(confd.session, "ietf-routing", "//.",
-			SR_SUBSCR_CHANGE_ALL_MODULES, change_cb, &confd, &confd.sub);
-
-	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);
+	rc = subscribe_module("infix-dhcp-server", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-dhcp-server");
+		goto err;
+	}
+	rc = subscribe_module("ietf-routing", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-routing");
+		goto err;
+	}
+	rc = subscribe_module("ietf-hardware", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to ietf-hardware");
+		goto err;
+	}
+	rc = subscribe_module("infix-firewall", &confd, 0);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-firewall");
+		goto err;
+	}
+	rc = subscribe_module("infix-meta", &confd, SR_SUBSCR_UPDATE);
+	if (rc) {
+		ERROR("Failed to subscribe to infix-meta");
+		goto err;
+	}
 
-	rc = ietf_keystore_update_init(&confd);
-	if(rc)
+	rc = ietf_system_rpc_init(&confd);
+	if (rc)
 		goto err;
-	rc = ietf_system_init(&confd);
+	rc = infix_containers_rpc_init(&confd);
 	if (rc)
 		goto err;
-	rc = infix_containers_init(&confd);
+	rc = infix_dhcp_server_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_dhcp_server_init(&confd);
+	rc = infix_factory_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_factory_init(&confd);
+	rc = ietf_factory_default_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = ietf_factory_default_init(&confd);
+	rc = infix_firewall_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_meta_init(&confd);
+	rc = infix_system_sw_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_system_sw_init(&confd);
+	/* Candidate infer configurations */
+	rc = ietf_hardware_candidate_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = ietf_hardware_init(&confd);
+	rc = infix_firewall_candidate_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_firewall_init(&confd);
+	rc = infix_dhcp_server_candidate_init(&confd);
 	if (rc)
 		goto err;
 
+	rc = infix_dhcp_client_candidate_init(&confd);
+	if (rc)
+		goto err;
 	/* YOUR_INIT GOES HERE */
 
 	return SR_ERR_OK;
 err:
-fail:
 	ERROR("init failed: %s", sr_strerror(rc));
 	if (confd.root)
 		json_decref(confd.root);