diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 2bc3c92..b1d9431 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -17,5 +17,5 @@ FIXME ## Reviewers -@demophoon +@highb @briancain diff --git a/lib/vmfloaty.rb b/lib/vmfloaty.rb index 3672c8b..9165423 100644 --- a/lib/vmfloaty.rb +++ b/lib/vmfloaty.rb @@ -185,9 +185,11 @@ class Vmfloaty command :delete do |c| c.syntax = 'floaty delete hostname,hostname2 [options]' + c.syntax += "\n floaty delete job1,job2 [options] (only supported with ABS)" c.summary = 'Schedules the deletion of a host or hosts' - c.description = 'Given a comma separated list of hostnames, or --all for all vms, vmfloaty makes a request to the pooler service to schedule the deletion of those vms.' + c.description = 'Given a comma separated list of hostnames, or --all for all vms, vmfloaty makes a request to the pooler service to schedule the deletion of those vms. If you are using the ABS service, you can also pass in JobIDs here. Note that passing in a Job ID will delete *all* of the hosts in the job.' # rubocop:disable Layout/LineLength c.example 'Schedules the deletion of a host or hosts', 'floaty delete myhost1,myhost2 --url http://vmpooler.example.com' + c.example 'Schedules the deletion of a JobID or JobIDs', 'floaty delete 1579300120799,1579300120800 --url http://abs.example.com' c.option '--verbose', 'Enables verbose output' c.option '--service STRING', String, 'Configured pooler service name' c.option '--all', 'Deletes all vms acquired by a token' diff --git a/lib/vmfloaty/abs.rb b/lib/vmfloaty/abs.rb index 6673eb3..259f411 100644 --- a/lib/vmfloaty/abs.rb +++ b/lib/vmfloaty/abs.rb @@ -100,6 +100,11 @@ class ABS requests.each do |req_hash| next unless req_hash['state'] == 'allocated' || req_hash['state'] == 'filled' + if hosts.include? req_hash['request']['job']['id'] + jobs_to_delete.push(req_hash) + next + end + req_hash['allocated_resources'].each do |vm_name, _i| if hosts.include? vm_name['hostname'] if all_job_resources_accounted_for(req_hash['allocated_resources'], hosts) diff --git a/spec/vmfloaty/abs_spec.rb b/spec/vmfloaty/abs_spec.rb index 7e46a00..b59380a 100644 --- a/spec/vmfloaty/abs_spec.rb +++ b/spec/vmfloaty/abs_spec.rb @@ -65,14 +65,14 @@ describe ABS do describe '#test_abs_status_queue_endpoint' do before :each do - # rubocop:disable Metrics/LineLength + # rubocop:disable Layout/LineLength @active_requests_response = ' [ "{ \"state\":\"allocated\",\"last_processed\":\"2019-12-16 23:00:34 +0000\",\"allocated_resources\":[{\"hostname\":\"take-this.delivery.puppetlabs.net\",\"type\":\"win-2012r2-x86_64\",\"engine\":\"vmpooler\"}],\"audit_log\":{\"2019-12-13 16:45:29 +0000\":\"Allocated take-this.delivery.puppetlabs.net for job 1576255517241\"},\"request\":{\"resources\":{\"win-2012r2-x86_64\":1},\"job\":{\"id\":\"1576255517241\",\"tags\":{\"user\":\"test-user\"},\"user\":\"test-user\",\"time-received\":1576255519},\"priority\":1}}", "null", "{\"state\":\"allocated\",\"last_processed\":\"2019-12-16 23:00:34 +0000\",\"allocated_resources\":[{\"hostname\":\"not-this.delivery.puppetlabs.net\",\"type\":\"win-2012r2-x86_64\",\"engine\":\"vmpooler\"}],\"audit_log\":{\"2019-12-13 16:46:14 +0000\":\"Allocated not-this.delivery.puppetlabs.net for job 1576255565159\"},\"request\":{\"resources\":{\"win-2012r2-x86_64\":1},\"job\":{\"id\":\"1576255565159\",\"tags\":{\"user\":\"not-test-user\"},\"user\":\"not-test-user\",\"time-received\":1576255566},\"priority\":1}}" ]' - # rubocop:enable Metrics/LineLength + # rubocop:enable Layout/LineLength @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y' @test_user = 'test-user' end @@ -92,5 +92,35 @@ describe ABS do ) end end + + describe '#test_abs_delete_jobid' do + before :each do + # rubocop:disable Layout/LineLength + @active_requests_response = ' + [ + "{ \"state\":\"allocated\", \"last_processed\":\"2020-01-17 22:29:13 +0000\", \"allocated_resources\":[{\"hostname\":\"craggy-chord.delivery.puppetlabs.net\", \"type\":\"centos-7-x86_64\", \"engine\":\"vmpooler\"}, {\"hostname\":\"visible-revival.delivery.puppetlabs.net\", \"type\":\"centos-7-x86_64\", \"engine\":\"vmpooler\"}], \"audit_log\":{\"2020-01-17 22:28:45 +0000\":\"Allocated craggy-chord.delivery.puppetlabs.net, visible-revival.delivery.puppetlabs.net for job 1579300120799\"}, \"request\":{\"resources\":{\"centos-7-x86_64\":2}, \"job\":{\"id\":\"1579300120799\", \"tags\":{\"user\":\"test-user\"}, \"user\":\"test-user\", \"time-received\":1579300120}, \"priority\":3}}" + ]' + @return_request = { '{"job_id":"1579300120799","hosts":{"hostname":"craggy-chord.delivery.puppetlabs.net","type":"centos-7-x86_64","engine":"vmpooler"},{"hostname":"visible-revival.delivery.puppetlabs.net","type":"centos-7-x86_64","engine":"vmpooler"}}'=>true } + # rubocop:enable Layout/LineLength + @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y' + @test_user = 'test-user' + # Job ID + @hosts = ['1579300120799'] + end + + it 'will delete the whole job' do + stub_request(:get, 'https://abs.example.com/status/queue') + .to_return(:status => 200, :body => @active_requests_response, :headers => {}) + stub_request(:post, 'https://abs.example.com/return') + .with(:body => @return_request) + .to_return(:status => 200, :body => 'OK', :headers => {}) + + ret = ABS.delete(false, @abs_url, @hosts, @token, @test_user) + + expect(ret).to include( + 'craggy-chord.delivery.puppetlabs.net' => { 'ok'=>true }, 'visible-revival.delivery.puppetlabs.net' => { 'ok'=>true }, + ) + end + end end end