Merge pull request #1125 from milroy/ctor-fix

Fix `resource_pool_t` ctor and JGF reader

Author: mergify[bot]

resource/readers/resource_reader_jgf.cpp

@@ -139,6 +139,7 @@ void fetch_helper_t::scrub ()
     size = -1;
     uniq_id = -1;
     exclusive = -1;
+    status = resource_pool_t::status_t::UP;
     type = NULL;
     name = NULL;
     unit = NULL;

resource/schema/resource_data.cpp

@@ -41,6 +41,7 @@ resource_pool_t::resource_pool_t (const resource_pool_t &o)
     id = o.id;
     uniq_id = o.uniq_id;
     rank = o.rank;
+    status = o.status;
     size = o.size;
     unit = o.unit;
     schedule = o.schedule;
@@ -57,6 +58,7 @@ resource_pool_t &resource_pool_t::operator= (const resource_pool_t &o)
     id = o.id;
     uniq_id = o.uniq_id;
     rank = o.rank;
+    status = o.status;
     size = o.size;
     unit = o.unit;
     schedule = o.schedule;

t/t3025-resource-find.t

@@ -11,6 +11,7 @@ full_job="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/find/full.yaml"
 cmd_dir="${SHARNESS_TEST_SRCDIR}/data/resource/commands/find"
 exp_dir="${SHARNESS_TEST_SRCDIR}/data/resource/expected/find"
 grugs="${SHARNESS_TEST_SRCDIR}/data/resource/grugs/tiny.graphml"
+jgf="${SHARNESS_TEST_SRCDIR}/data/resource/jgfs/tiny.json"
 query="../../resource/utilities/resource-query"
 
 skip_all_unless_have jq
@@ -309,4 +310,20 @@ EOF
     test ${core} = "\"0\""
 '
 
+test_expect_success 'setting vertex down in JGF same as set-status' '
+    cat > cmds021 <<-EOF &&
+	set-status /tiny0/rack0/node0/socket0/core0 down
+	find status=down
+	quit
+EOF
+    cat > cmds022 <<-EOF &&
+	find status=down
+	quit
+EOF
+    ${query} -L ${jgf} -f jgf -S CA -P high -t down21.out < cmds021 &&
+    sed "/\"uniq_id\": 8,/a \ \ \ \ \ \ \ \ \ \ \"status\": 1," ${jgf} > down21.json &&
+    ${query} -L ./down21.json -f jgf -S CA -P high -t down22.out < cmds022 &&
+    test_cmp down21.out down22.out
+'
+
 test_done