X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Fintegration%2Fmock_plugin.c;h=0724ce1dd49b9dc9b18f0e7dbb2693c381d5c403;hp=8c161943617f58db39f195df1b87b7589941bc3b;hb=1f99d1a0d8a7e923dede7c938340c26061b8398b;hpb=2efe0d8940ec67c630a02b14cd27bccb810be77f

diff --git a/t/integration/mock_plugin.c b/t/integration/mock_plugin.c
index 8c16194..0724ce1 100644
--- a/t/integration/mock_plugin.c
+++ b/t/integration/mock_plugin.c
@@ -54,15 +54,24 @@ static const char *hostnames[] = {
 static struct {
 	const char *hostname;
 	const char *metric;
+	sdb_metric_store_t store;
 } metrics[] = {
-	{ "some.host.name", "foo/bar/qux" },
-	{ "some.host.name", "foo/bar/baz" },
-	{ "some.host.name", "foo2/bar/qux" },
-	{ "some.host.name", "foo2/bar/baz" },
-	{ "other.host.name", "foo/bar/qux" },
-	{ "other.host.name", "foo/bar/baz" },
-	{ "other.host.name", "foo2/bar/qux" },
-	{ "other.host.name", "foo2/bar/baz" },
+	{ "some.host.name", "foo/bar/qux",
+		{ "mock", "/var/lib/collectd/rrd/foo/bar/qux.rrd", NULL, 0 } },
+	{ "some.host.name", "foo/bar/baz",
+		{ "mock", "/var/lib/collectd/rrd/foo/bar/baz.rrd", NULL, 0 } },
+	{ "some.host.name", "foo2/bar/qux",
+		{ "mock", "/var/lib/collectd/rrd/foo2/bar/qux.rrd", NULL, 0 } },
+	{ "some.host.name", "foo2/bar/baz",
+		{ "mock", "/var/lib/collectd/rrd/foo2/bar/baz.rrd", NULL, 0 } },
+	{ "other.host.name", "foo/bar/qux",
+		{ "mock", "/var/lib/collectd/rrd/foo/bar/qux.rrd", NULL, 0 } },
+	{ "other.host.name", "foo/bar/baz",
+		{ "mock", "/var/lib/collectd/rrd/foo/bar/baz.rrd", NULL, 0 } },
+	{ "other.host.name", "foo2/bar/qux",
+		{ "mock", "/var/lib/collectd/rrd/foo2/bar/qux.rrd", NULL, 0 } },
+	{ "other.host.name", "foo2/bar/baz",
+		{ "mock", "/var/lib/collectd/rrd/foo2/bar/baz.rrd", NULL, 0 } },
 };
 
 static struct {
@@ -144,22 +153,23 @@ mock_collect(sdb_object_t *user_data)
 	}
 
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(hostnames); ++i) {
-		if ((check = sdb_store_host(hostnames[i], sdb_gettime()))) {
+		if ((check = sdb_plugin_store_host(hostnames[i], sdb_gettime()))) {
 			sdb_log(SDB_LOG_ERR, "mock::plugin: Failed to store host: "
 					"status %d", check);
 			exit(1);
 		}
 	}
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(metrics); ++i) {
-		if ((check = sdb_store_metric(metrics[i].hostname,
-						metrics[i].metric, sdb_gettime()))) {
+		if ((check = sdb_plugin_store_metric(metrics[i].hostname,
+						metrics[i].metric, &metrics[i].store,
+						sdb_gettime()))) {
 			sdb_log(SDB_LOG_ERR, "mock::plugin: Failed to store metric: "
 					"status %d", check);
 			exit(1);
 		}
 	}
 	for (i = 0; i < SDB_STATIC_ARRAY_LEN(services); ++i) {
-		if ((check = sdb_store_service(services[i].hostname,
+		if ((check = sdb_plugin_store_service(services[i].hostname,
 						services[i].service, sdb_gettime()))) {
 			sdb_log(SDB_LOG_ERR, "mock::plugin: Failed to store service: "
 					"status %d", check);
@@ -170,7 +180,7 @@ mock_collect(sdb_object_t *user_data)
 		sdb_data_t datum = { SDB_TYPE_STRING, { .string = NULL } };
 		datum.data.string = strdup(attributes[i].value);
 
-		if ((check = sdb_store_attribute(attributes[i].hostname,
+		if ((check = sdb_plugin_store_attribute(attributes[i].hostname,
 						attributes[i].name, &datum, sdb_gettime()))) {
 			sdb_log(SDB_LOG_ERR, "mock::plugin: Failed to store attribute: "
 					"status %d", check);