Merge branch '7668-crunch-node-properties-wip'

Closes #7668, #7672.

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 4a1fdbce758d7b552f529419f7c37f970299d298..9fb25664a41eb5befe7067aef83686fb5fcdc1f6 100755 (executable)
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -194,7 +194,7 @@ class Dispatcher
     # Otherwise, return nil.
     need_procs = NODE_CONSTRAINT_MAP.each_pair.map do |job_key, node_key|
       Proc.new do |node|
-        positive_int(node.info[node_key], 0) >=
+        positive_int(node.properties[node_key], 0) >=
           positive_int(job.runtime_constraints[job_key], 0)
       end
     end

diff --git a/services/api/test/fixtures/nodes.yml b/services/api/test/fixtures/nodes.yml
index 6ca22e152615c30180de4fc07a5e6d19c2b8ed12..23d2e1955eeee141e263a68f7aa101549e3037b1 100644 (file)
--- a/services/api/test/fixtures/nodes.yml
+++ b/services/api/test/fixtures/nodes.yml
@@ -38,6 +38,7 @@ idle:
   info:
     ping_secret: "69udawxvn3zzj45hs8bumvndricrha4lcpi23pd69e44soanc0"
     slurm_state: "idle"
+  properties:
     total_cpu_cores: 16
 
 was_idle_now_down:
@@ -53,6 +54,7 @@ was_idle_now_down:
   info:
     ping_secret: "1bd1yi0x4lb5q4gzqqtrnq30oyj08r8dtdimmanbqw49z1anz2"
     slurm_state: "idle"
+  properties:
     total_cpu_cores: 16
 
 new_with_no_hostname: