fabrics: move connect config json code to the library

Move the connect config json code to the library.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

fabrics.c

@@ -766,56 +766,6 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 	return ret;
 }
 
-static int nvme_connect_config(struct nvme_global_ctx *ctx, const char *hostnqn,
-			       const char *hostid,
-			       const struct nvme_fabrics_config *cfg)
-{
-	const char *hnqn, *hid;
-	const char *transport;
-	nvme_host_t h;
-	nvme_subsystem_t s;
-	nvme_ctrl_t c, _c;
-	int ret = 0, err;
-
-	nvme_for_each_host(ctx, h) {
-		nvme_for_each_subsystem(h, s) {
-			hnqn = nvme_host_get_hostnqn(h);
-			if (hostnqn && hnqn && strcmp(hostnqn, hnqn))
-				continue;
-			hid = nvme_host_get_hostid(h);
-			if (hostid && hid && strcmp(hostid, hid))
-				continue;
-
-			nvme_subsystem_for_each_ctrl_safe(s, c, _c) {
-				transport = nvme_ctrl_get_transport(c);
-
-				/* ignore none fabric transports */
-				if (strcmp(transport, "tcp") &&
-				    strcmp(transport, "rdma") &&
-				    strcmp(transport, "fc"))
-					continue;
-
-				err = nvmf_connect_ctrl(c);
-				if (err) {
-					if (err == -ENVME_CONNECT_ALREADY)
-						continue;
-
-					fprintf(stderr,
-						"failed to connect to hostnqn=%s,nqn=%s,%s\n",
-						nvme_host_get_hostnqn(h),
-						nvme_subsystem_get_name(s),
-						nvme_ctrl_get_address(c));
-
-					if (!ret)
-						ret = err;
-				}
-			}
-		}
-	}
-
-	return ret;
-}
-
 static void nvme_parse_tls_args(const char *keyring, const char *tls_key,
 				const char *tls_key_identity,
 				struct nvme_fabrics_config *cfg, nvme_ctrl_t c)
@@ -944,7 +894,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
 		trsvcid = nvmf_get_default_trsvcid(transport, false);
 
 	if (config_file)
-		return nvme_connect_config(ctx, hostnqn, hostid, &cfg);
+		return nvmf_connect_config_json(ctx, hostnqn, hostid, &cfg);
 
 	struct tr_config trcfg = {
 		.subsysnqn	= subsysnqn,

libnvme/src/libnvme.map

@@ -288,6 +288,7 @@ LIBNVME_2_0 {
 		nvmf_add_ctrl;
 		nvmf_adrfam_str;
 		nvmf_cms_str;
+		nvmf_connect_config_json;
 		nvmf_connect_ctrl;
 		nvmf_connect_disc_entry;
 		nvmf_default_config;

libnvme/src/nvme/fabrics.c

@@ -2389,3 +2389,52 @@ int nvmf_discovery_config_json(struct nvme_global_ctx *ctx,
 
 	return ret;
 }
+
+int nvmf_connect_config_json(struct nvme_global_ctx *ctx, const char *hostnqn,
+		const char *hostid, const struct nvme_fabrics_config *cfg)
+{
+	const char *hnqn, *hid;
+	const char *transport;
+	nvme_host_t h;
+	nvme_subsystem_t s;
+	nvme_ctrl_t c, _c;
+	int ret = 0, err;
+
+	nvme_for_each_host(ctx, h) {
+		nvme_for_each_subsystem(h, s) {
+			hnqn = nvme_host_get_hostnqn(h);
+			if (hostnqn && hnqn && strcmp(hostnqn, hnqn))
+				continue;
+			hid = nvme_host_get_hostid(h);
+			if (hostid && hid && strcmp(hostid, hid))
+				continue;
+
+			nvme_subsystem_for_each_ctrl_safe(s, c, _c) {
+				transport = nvme_ctrl_get_transport(c);
+
+				/* ignore none fabric transports */
+				if (strcmp(transport, "tcp") &&
+				    strcmp(transport, "rdma") &&
+				    strcmp(transport, "fc"))
+					continue;
+
+				err = nvmf_connect_ctrl(c);
+				if (err) {
+					if (err == -ENVME_CONNECT_ALREADY)
+						continue;
+
+					fprintf(stderr,
+						"failed to connect to hostnqn=%s,nqn=%s,%s\n",
+						nvme_host_get_hostnqn(h),
+						nvme_subsystem_get_name(s),
+						nvme_ctrl_get_address(c));
+
+					if (!ret)
+						ret = err;
+				}
+			}
+		}
+	}
+
+	return ret;
+}

libnvme/src/nvme/fabrics.h

@@ -440,4 +440,7 @@ int nvmf_discovery(struct nvme_global_ctx *ctx, struct nvmf_discovery_ctx *dctx,
 int nvmf_discovery_config_json(struct nvme_global_ctx *ctx,
 		struct nvmf_discovery_ctx *dctx, const char *hostnqn,
 		const char *hostid, bool connect, bool force);
+
+int nvmf_connect_config_json(struct nvme_global_ctx *ctx, const char *hostnqn,
+		const char *hostid, const struct nvme_fabrics_config *cfg);
 #endif /* _LIBNVME_FABRICS_H */