X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/093bae4c914a872c501c3235f06096092725f015..8a0e9c549595e114a0eadc9d6792a17fb59d0f3e:/services/api/test/functional/arvados/v1/nodes_controller_test.rb?ds=sidebyside

diff --git a/services/api/test/functional/arvados/v1/nodes_controller_test.rb b/services/api/test/functional/arvados/v1/nodes_controller_test.rb
index dd942b691e..435764baa4 100644
--- a/services/api/test/functional/arvados/v1/nodes_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/nodes_controller_test.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class Arvados::V1::NodesControllerTest < ActionController::TestCase
@@ -17,8 +21,8 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
     authorize_with :inactive
     get :index
     assert_response :success
-    node_items = JSON.parse(@response.body)['items']
-    assert_equal 0, node_items.size
+    assert_equal 0, json_response['items'].size
+    assert_equal 0, json_response['items_available']
   end
 
   # active user sees non-secret attributes of up and recently-up nodes
@@ -26,8 +30,9 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
     authorize_with :active
     get :index
     assert_response :success
-    node_items = JSON.parse(@response.body)['items']
-    assert_not_equal 0, node_items.size
+    assert_operator 0, :<, json_response['items_available']
+    node_items = json_response['items']
+    assert_operator 0, :<, node_items.size
     found_busy_node = false
     node_items.each do |node|
       assert_nil node['info'].andand['ping_secret']
@@ -41,7 +46,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
   end
 
   test "node should ping with ping_secret and no token" do
-    post :ping, {
+    post :ping, params: {
       id: 'zzzzz-7ekkf-2z3mc76g2q73aio',
       instance_id: 'i-0000000',
       local_ipv4: '172.17.2.174',
@@ -57,7 +62,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
   end
 
   test "node should fail ping with invalid ping_secret" do
-    post :ping, {
+    post :ping, params: {
       id: 'zzzzz-7ekkf-2z3mc76g2q73aio',
       instance_id: 'i-0000000',
       local_ipv4: '172.17.2.174',
@@ -68,17 +73,59 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
 
   test "create node" do
     authorize_with :admin
-    post :create
+    post :create, params: {node: {}}
+    assert_response :success
+    assert_not_nil json_response['uuid']
+    assert_not_nil json_response['info'].is_a? Hash
+    assert_not_nil json_response['info']['ping_secret']
+    assert_nil json_response['slot_number']
+    assert_nil json_response['hostname']
+  end
+
+  test "create node and assign slot" do
+    authorize_with :admin
+    post :create, params: {node: {}, assign_slot: true}
     assert_response :success
     assert_not_nil json_response['uuid']
     assert_not_nil json_response['info'].is_a? Hash
     assert_not_nil json_response['info']['ping_secret']
+    assert_operator 0, :<, json_response['slot_number']
+    n = json_response['slot_number']
+    assert_equal "compute#{n}", json_response['hostname']
+
+    node = Node.where(uuid: json_response['uuid']).first
+    assert_equal n, node.slot_number
+    assert_equal "compute#{n}", node.hostname
+  end
+
+  test "update node and assign slot" do
+    authorize_with :admin
+    node = nodes(:new_with_no_hostname)
+    post :update, params: {id: node.uuid, node: {}, assign_slot: true}
+    assert_response :success
+    assert_operator 0, :<, json_response['slot_number']
+    n = json_response['slot_number']
+    assert_equal "compute#{n}", json_response['hostname']
+
+    node.reload
+    assert_equal n, node.slot_number
+    assert_equal "compute#{n}", node.hostname
+  end
+
+  test "update node and assign slot, don't clobber hostname" do
+    authorize_with :admin
+    node = nodes(:new_with_custom_hostname)
+    post :update, params: {id: node.uuid, node: {}, assign_slot: true}
+    assert_response :success
+    assert_operator 0, :<, json_response['slot_number']
+    n = json_response['slot_number']
+    assert_equal "custom1", json_response['hostname']
   end
 
   test "ping adds node stats to info" do
     authorize_with :admin
     node = nodes(:idle)
-    post :ping, {
+    post :ping, params: {
       id: node.uuid,
       ping_secret: node.info['ping_secret'],
       total_cpu_cores: 32,
@@ -96,23 +143,32 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
 
   test "active user can see their assigned job" do
     authorize_with :active
-    get :show, {id: nodes(:busy).uuid}
+    get :show, params: {id: nodes(:busy).uuid}
     assert_response :success
     assert_equal(jobs(:nearly_finished_job).uuid, json_response["job_uuid"])
   end
 
   test "user without job read permission can't see job" do
     authorize_with :spectator
-    get :show, {id: nodes(:busy).uuid}
+    get :show, params: {id: nodes(:busy).uuid}
     assert_response :success
     assert_nil(json_response["job"], "spectator can see node's assigned job")
   end
 
+  [:admin, :spectator].each do |user|
+    test "select param does not break node list for #{user}" do
+      authorize_with user
+      get :index, params: {select: ['domain']}
+      assert_response :success
+      assert_operator 0, :<, json_response['items_available']
+    end
+  end
+
   test "admin can associate a job with a node" do
     changed_node = nodes(:idle)
     assigned_job = jobs(:queued)
     authorize_with :admin
-    post :update, {
+    post :update, params: {
       id: changed_node.uuid,
       node: {job_uuid: assigned_job.uuid},
     }
@@ -125,7 +181,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
 
   test "non-admin can't associate a job with a node" do
     authorize_with :active
-    post :update, {
+    post :update, params: {
       id: nodes(:idle).uuid,
       node: {job_uuid: jobs(:queued).uuid},
     }
@@ -135,7 +191,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
   test "admin can unassign a job from a node" do
     changed_node = nodes(:busy)
     authorize_with :admin
-    post :update, {
+    post :update, params: {
       id: changed_node.uuid,
       node: {job_uuid: nil},
     }
@@ -148,7 +204,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
 
   test "non-admin can't unassign a job from a node" do
     authorize_with :project_viewer
-    post :update, {
+    post :update, params: {
       id: nodes(:busy).uuid,
       node: {job_uuid: nil},
     }
@@ -157,7 +213,7 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
 
   test "job readable after updating other attributes" do
     authorize_with :admin
-    post :update, {
+    post :update, params: {
       id: nodes(:busy).uuid,
       node: {last_ping_at: 1.second.ago},
     }
@@ -165,4 +221,51 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
     assert_equal(jobs(:nearly_finished_job).uuid, json_response["job_uuid"],
                  "mismatched job UUID after ping update")
   end
+
+  test "node should fail ping with invalid hostname config format" do
+    Rails.configuration.Containers["SLURM"]["Managed"]["AssignNodeHostname"] = 'compute%<slot_number>04'  # should end with "04d"
+    post :ping, params: {
+      id: nodes(:new_with_no_hostname).uuid,
+      ping_secret: nodes(:new_with_no_hostname).info['ping_secret'],
+    }
+    assert_response 422
+  end
+
+  test "first ping should set ip addr using local_ipv4 when provided" do
+    post :ping, params: {
+      id: 'zzzzz-7ekkf-nodenoipaddryet',
+      instance_id: 'i-0000000',
+      local_ipv4: '172.17.2.172',
+      ping_secret: 'abcdyefg4lb5q4gzqqtrnq30oyj08r8dtdimmanbqw49z1anz2'
+    }
+    assert_response :success
+    response = JSON.parse(@response.body)
+    assert_equal 'zzzzz-7ekkf-nodenoipaddryet', response['uuid']
+    assert_equal '172.17.2.172', response['ip_address']
+  end
+
+  test "first ping should set ip addr using remote_ip when local_ipv4 is not provided" do
+    post :ping, params: {
+      id: 'zzzzz-7ekkf-nodenoipaddryet',
+      instance_id: 'i-0000000',
+      ping_secret: 'abcdyefg4lb5q4gzqqtrnq30oyj08r8dtdimmanbqw49z1anz2'
+    }
+    assert_response :success
+    response = JSON.parse(@response.body)
+    assert_equal 'zzzzz-7ekkf-nodenoipaddryet', response['uuid']
+    assert_equal request.remote_ip, response['ip_address']
+  end
+
+  test "future pings should not change previous ip address" do
+    post :ping, params: {
+      id: 'zzzzz-7ekkf-2z3mc76g2q73aio',
+      instance_id: 'i-0000000',
+      local_ipv4: '172.17.2.175',
+      ping_secret: '69udawxvn3zzj45hs8bumvndricrha4lcpi23pd69e44soanc0'
+    }
+    assert_response :success
+    response = JSON.parse(@response.body)
+    assert_equal 'zzzzz-7ekkf-2z3mc76g2q73aio', response['uuid']
+    assert_equal '172.17.2.174', response['ip_address']   # original ip address is not overwritten
+  end
 end