vmfloaty 1.2.0 → 1.6.0

data/spec/vmfloaty/abs_spec.rb

@@ -11,12 +11,12 @@ describe ABS do
 
   describe '#list' do
     it 'skips empty platforms and lists aws' do
-      stub_request(:get, "http://foo/api/v2/status/platforms/vmpooler").
-          to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/api/v2/status/platforms/ondemand_vmpooler").
-          to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/api/v2/status/platforms/nspooler").
-          to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/vmpooler')
+        .to_return(status: 200, body: '', headers: {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/ondemand_vmpooler')
+        .to_return(status: 200, body: '', headers: {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/nspooler')
+        .to_return(status: 200, body: '', headers: {})
       body = '{
                 "aws_platforms": [
                   "amazon-6-x86_64",
@@ -26,50 +26,55 @@ describe ABS do
                   "redhat-8-arm64"
                 ]
               }'
-      stub_request(:get, "http://foo/api/v2/status/platforms/aws").
-          to_return(:status => 200, :body => body, :headers => {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/aws')
+        .to_return(status: 200, body: body, headers: {})
 
+      results = ABS.list(false, 'http://foo')
 
-      results = ABS.list(false, "http://foo")
-
-      expect(results).to include("amazon-6-x86_64", "amazon-7-x86_64", "amazon-7-arm64", "centos-7-x86-64-west", "redhat-8-arm64")
+      expect(results).to include('amazon-6-x86_64', 'amazon-7-x86_64', 'amazon-7-arm64', 'centos-7-x86-64-west',
+                                 'redhat-8-arm64')
     end
     it 'legacy JSON string, prior to PR 306' do
-      stub_request(:get, "http://foo/api/v2/status/platforms/vmpooler").
-          to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/api/v2/status/platforms/ondemand_vmpooler").
-          to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/api/v2/status/platforms/nspooler").
-          to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/vmpooler')
+        .to_return(status: 200, body: '', headers: {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/ondemand_vmpooler')
+        .to_return(status: 200, body: '', headers: {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/nspooler')
+        .to_return(status: 200, body: '', headers: {})
       body = '{
           "aws_platforms": "[\"amazon-6-x86_64\",\"amazon-7-x86_64\",\"amazon-7-arm64\",\"centos-7-x86-64-west\",\"redhat-8-arm64\"]"
       }'
-      stub_request(:get, "http://foo/api/v2/status/platforms/aws").
-          to_return(:status => 200, :body => body, :headers => {})
+      stub_request(:get, 'http://foo/api/v2/status/platforms/aws')
+        .to_return(status: 200, body: body, headers: {})
 
-      results = ABS.list(false, "http://foo")
+      results = ABS.list(false, 'http://foo')
 
-      expect(results).to include("amazon-6-x86_64", "amazon-7-x86_64", "amazon-7-arm64", "centos-7-x86-64-west", "redhat-8-arm64")
+      expect(results).to include('amazon-6-x86_64', 'amazon-7-x86_64', 'amazon-7-arm64', 'centos-7-x86-64-west',
+                                 'redhat-8-arm64')
     end
   end
 
   describe '#format' do
     it 'returns an hash formatted like a vmpooler return, plus the job_id' do
-      job_id = "generated_by_floaty_12345"
+      job_id = 'generated_by_floaty_12345'
       abs_formatted_response = [
-        { 'hostname' => 'aaaaaaaaaaaaaaa.delivery.puppetlabs.net', 'type' => 'centos-7.2-x86_64', 'engine' => 'vmpooler' },
-        { 'hostname' => 'aaaaaaaaaaaaaab.delivery.puppetlabs.net', 'type' => 'centos-7.2-x86_64', 'engine' => 'vmpooler' },
-        { 'hostname' => 'aaaaaaaaaaaaaac.delivery.puppetlabs.net', 'type' => 'ubuntu-7.2-x86_64', 'engine' => 'vmpooler' },
+        { 'hostname' => 'aaaaaaaaaaaaaaa.delivery.puppetlabs.net', 'type' => 'centos-7.2-x86_64',
+          'engine' => 'vmpooler' },
+        { 'hostname' => 'aaaaaaaaaaaaaab.delivery.puppetlabs.net', 'type' => 'centos-7.2-x86_64',
+          'engine' => 'vmpooler' },
+        { 'hostname' => 'aaaaaaaaaaaaaac.delivery.puppetlabs.net', 'type' => 'ubuntu-7.2-x86_64',
+          'engine' => 'vmpooler' }
       ]
 
       vmpooler_formatted_response = ABS.translated(abs_formatted_response, job_id)
 
       vmpooler_formatted_compare = {
         'centos-7.2-x86_64' => {},
-        'ubuntu-7.2-x86_64' => {},
+        'ubuntu-7.2-x86_64' => {}
       }
 
-      vmpooler_formatted_compare['centos-7.2-x86_64']['hostname'] = ['aaaaaaaaaaaaaaa.delivery.puppetlabs.net', 'aaaaaaaaaaaaaab.delivery.puppetlabs.net']
+      vmpooler_formatted_compare['centos-7.2-x86_64']['hostname'] =
+        ['aaaaaaaaaaaaaaa.delivery.puppetlabs.net', 'aaaaaaaaaaaaaab.delivery.puppetlabs.net']
       vmpooler_formatted_compare['ubuntu-7.2-x86_64']['hostname'] = ['aaaaaaaaaaaaaac.delivery.puppetlabs.net']
 
       vmpooler_formatted_compare['ok'] = true
@@ -86,22 +91,22 @@ describe ABS do
       hosts = ['host1']
       allocated_resources = [
         {
-          'hostname' => 'host1',
+          'hostname' => 'host1'
         },
         {
-          'hostname' => 'host2',
-        },
+          'hostname' => 'host2'
+        }
       ]
       expect(ABS.all_job_resources_accounted_for(allocated_resources, hosts)).to eq(false)
 
-      hosts = ['host1', 'host2']
+      hosts = %w[host1 host2]
       allocated_resources = [
         {
-          'hostname' => 'host1',
+          'hostname' => 'host1'
         },
         {
-          'hostname' => 'host2',
-        },
+          'hostname' => 'host2'
+        }
       ]
       expect(ABS.all_job_resources_accounted_for(allocated_resources, hosts)).to eq(true)
     end
@@ -126,16 +131,16 @@ describe ABS do
 
       it 'will skip a line with a null value returned from abs' do
         stub_request(:get, 'https://abs.example.com/api/v2/status/queue')
-          .to_return(:status => 200, :body => @active_requests_response, :headers => {})
+          .to_return(status: 200, body: @active_requests_response, headers: {})
 
         ret = ABS.get_active_requests(false, @abs_url, @test_user)
 
         expect(ret[0]).to include(
           'allocated_resources' => [{
             'hostname' => 'take-this.delivery.puppetlabs.net',
-            'type'     => 'win-2012r2-x86_64',
-            'engine'   => 'vmpooler',
-          }],
+            'type' => 'win-2012r2-x86_64',
+            'engine' => 'vmpooler'
+          }]
         )
       end
     end
@@ -147,7 +152,11 @@ describe ABS do
         [
           { "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 }
+        @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"}]
+        }
         # rubocop:enable Layout/LineLength
         @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y'
         @test_user = 'test-user'
@@ -157,15 +166,15 @@ describe ABS do
 
       it 'will delete the whole job' do
         stub_request(:get, 'https://abs.example.com/api/v2/status/queue')
-          .to_return(:status => 200, :body => @active_requests_response, :headers => {})
+          .to_return(status: 200, body: @active_requests_response, headers: {})
         stub_request(:post, 'https://abs.example.com/api/v2/return')
-          .with(:body => @return_request)
-          .to_return(:status => 200, :body => 'OK', :headers => {})
+          .with(headers: get_headers(content_type: 'application/x-www-form-urlencoded', token: @token), body: @return_request.to_json)
+          .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 },
+          'craggy-chord.delivery.puppetlabs.net' => { 'ok' => true }, 'visible-revival.delivery.puppetlabs.net' => { 'ok' => true }
         )
       end
     end

data/spec/vmfloaty/auth_spec.rb

@@ -3,6 +3,9 @@
 require 'spec_helper'
 require_relative '../../lib/vmfloaty/auth'
 
+user = 'first.last'
+pass = 'password'
+
 describe Pooler do
   before :each do
     @vmpooler_url = 'https://vmpooler.example.com'
@@ -15,18 +18,20 @@ describe Pooler do
     end
 
     it 'returns a token from vmpooler' do
-      stub_request(:post, 'https://first.last:password@vmpooler.example.com/token')
-        .to_return(:status => 200, :body => @get_token_response, :headers => {})
+      stub_request(:post, 'https://vmpooler.example.com/token')
+        .with(headers: get_headers(username: user, password: pass, content_length: 0))
+        .to_return(status: 200, body: @get_token_response, headers: {})
 
-      token = Auth.get_token(false, @vmpooler_url, 'first.last', 'password')
+      token = Auth.get_token(false, @vmpooler_url, user, pass)
       expect(token).to eq @token
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:post, 'https://first.last:password@vmpooler.example.com/token')
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+      stub_request(:post, 'https://vmpooler.example.com/token')
+      .with(headers: get_headers(username: user, password: pass, content_length: 0))
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
-      expect { Auth.get_token(false, @vmpooler_url, 'first.last', 'password') }.to raise_error(TokenError)
+      expect { Auth.get_token(false, @vmpooler_url, user, pass) }.to raise_error(TokenError)
     end
   end
 
@@ -37,15 +42,18 @@ describe Pooler do
     end
 
     it 'deletes the specified token' do
-      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .to_return(:status => 200, :body => @delete_token_response, :headers => {})
+      stub_request(:delete, 'https://vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(headers: get_headers(username: user, password: pass))
+        .to_return(status: 200, body: @delete_token_response, headers: {})
 
-      expect(Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', @token)).to eq JSON.parse(@delete_token_response)
+      expect(Auth.delete_token(false, @vmpooler_url, user, pass,
+                               @token)).to eq JSON.parse(@delete_token_response)
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+      stub_request(:delete, 'https://vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(headers: get_headers(username: user, password: pass))
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
       expect { Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', @token) }.to raise_error(TokenError)
     end
@@ -63,14 +71,16 @@ describe Pooler do
 
     it 'checks the status of a token' do
       stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .to_return(:status => 200, :body => @token_status_response, :headers => {})
+        .with(headers: get_headers)
+        .to_return(status: 200, body: @token_status_response, headers: {})
 
       expect(Auth.token_status(false, @vmpooler_url, @token)).to eq JSON.parse(@token_status_response)
     end
 
     it 'raises a token error if something goes wrong' do
       stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+        .with(headers: get_headers)
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
       expect { Auth.token_status(false, @vmpooler_url, @token) }.to raise_error(TokenError)
     end

data/spec/vmfloaty/nonstandard_pooler_spec.rb

@@ -8,9 +8,7 @@ require 'vmfloaty/nonstandard_pooler'
 describe NonstandardPooler do
   before :each do
     @nspooler_url = 'https://nspooler.example.com'
-    @auth_token_headers = {
-      'X-Auth-Token' => 'token-value',
-    }
+    @auth_token_headers = get_headers(token: 'token-value')
   end
 
   describe '#list' do
@@ -36,7 +34,7 @@ describe NonstandardPooler do
 
     it 'returns an array with operating systems from the pooler' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(:status => 200, :body => @status_response_body, :headers => {})
+        .to_return(status: 200, body: @status_response_body, headers: {})
 
       list = NonstandardPooler.list(false, @nspooler_url, nil)
       expect(list).to be_an_instance_of Array
@@ -44,7 +42,7 @@ describe NonstandardPooler do
 
     it 'filters operating systems based on the filter param' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(:status => 200, :body => @status_response_body, :headers => {})
+        .to_return(status: 200, body: @status_response_body, headers: {})
 
       list = NonstandardPooler.list(false, @nspooler_url, 'aix')
       expect(list).to be_an_instance_of Array
@@ -53,7 +51,7 @@ describe NonstandardPooler do
 
     it 'returns nothing if the filter does not match' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(:status => 199, :body => @status_response_body, :headers => {})
+        .to_return(status: 199, body: @status_response_body, headers: {})
 
       list = NonstandardPooler.list(false, @nspooler_url, 'windows')
       expect(list).to be_an_instance_of Array
@@ -89,7 +87,7 @@ describe NonstandardPooler do
         .and_return(JSON.parse(@token_status_body_active))
 
       list = NonstandardPooler.list_active(false, @nspooler_url, 'token-value', 'user')
-      expect(list).to eql ['sol10-9', 'sol10-11']
+      expect(list).to eql %w[sol10-9 sol10-11]
     end
   end
 
@@ -121,17 +119,19 @@ describe NonstandardPooler do
 
     it 'raises an AuthError if the token is invalid' do
       stub_request(:post, "#{@nspooler_url}/host/solaris-11-sparc")
-        .with(:headers => @auth_token_headers)
-        .to_return(:status => 401, :body => '{"ok":false,"reason": "token: token-value does not exist"}', :headers => {})
+        .with(headers: get_headers(token: 'token-value'))
+        .to_return(status: 401, body: '{"ok":false,"reason": "token: token-value does not exist"}', headers: {})
 
       vm_hash = { 'solaris-11-sparc' => 1 }
-      expect { NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {}) }.to raise_error(AuthError)
+      expect do
+        NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {})
+      end.to raise_error(AuthError)
     end
 
     it 'retrieves a single vm with a token' do
       stub_request(:post, "#{@nspooler_url}/host/solaris-11-sparc")
-        .with(:headers => @auth_token_headers)
-        .to_return(:status => 200, :body => @retrieve_response_body_single, :headers => {})
+        .with(headers: @auth_token_headers)
+        .to_return(status: 200, body: @retrieve_response_body_single, headers: {})
 
       vm_hash = { 'solaris-11-sparc' => 1 }
       vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {})
@@ -142,15 +142,16 @@ describe NonstandardPooler do
 
     it 'retrieves a multiple vms with a token' do
       stub_request(:post, "#{@nspooler_url}/host/aix-7.1-power+solaris-10-sparc+solaris-10-sparc")
-        .with(:headers => @auth_token_headers)
-        .to_return(:status => 200, :body => @retrieve_response_body_many, :headers => {})
+        .with(headers: @auth_token_headers)
+        .to_return(status: 200, body: @retrieve_response_body_many, headers: {})
 
       vm_hash = { 'aix-7.1-power' => 1, 'solaris-10-sparc' => 2 }
       vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {})
       expect(vm_req).to be_an_instance_of Hash
       expect(vm_req['ok']).to equal true
       expect(vm_req['solaris-10-sparc']['hostname']).to be_an_instance_of Array
-      expect(vm_req['solaris-10-sparc']['hostname']).to eq ['sol10-9.delivery.puppetlabs.net', 'sol10-10.delivery.puppetlabs.net']
+      expect(vm_req['solaris-10-sparc']['hostname']).to eq ['sol10-9.delivery.puppetlabs.net',
+                                                            'sol10-10.delivery.puppetlabs.net']
       expect(vm_req['aix-7.1-power']['hostname']).to eq 'pe-aix-71-ci-acceptance.delivery.puppetlabs.net'
     end
   end
@@ -162,22 +163,22 @@ describe NonstandardPooler do
 
     it 'raises an error if the user tries to modify an unsupported attribute' do
       stub_request(:put, 'https://nspooler.example.com/host/myfakehost')
-        .with(:body    => { '{}' => true },
-              :headers => @auth_token_headers)
-        .to_return(:status => 200, :body => '', :headers => {})
-      details = { :lifetime => 12 }
+        .with(body: { '{}' => true },
+              headers: @auth_token_headers)
+        .to_return(status: 200, body: '', headers: {})
+      details = { lifetime: 12 }
       expect { NonstandardPooler.modify(false, @nspooler_url, 'myfakehost', 'token-value', details) }
         .to raise_error(ModifyError)
     end
 
     it 'modifies the reason of a vm' do
-      modify_request_body = { '{"reserved_for_reason":"testing"}' => true }
+      modify_request_body = { '{"reserved_for_reason":"testing"}' => nil }
       stub_request(:put, "#{@nspooler_url}/host/myfakehost")
-        .with(:body    => modify_request_body,
-              :headers => @auth_token_headers)
-        .to_return(:status => 200, :body => '{"ok": true}', :headers => {})
+        .with(body: modify_request_body,
+              headers: @auth_token_headers)
+        .to_return(status: 200, body: '{"ok": true}', headers: {})
 
-      modify_hash = { :reason => 'testing' }
+      modify_hash = { reason: 'testing' }
       modify_req = NonstandardPooler.modify(false, @nspooler_url, 'myfakehost', 'token-value', modify_hash)
       expect(modify_req['ok']).to be true
     end
@@ -208,7 +209,7 @@ describe NonstandardPooler do
 
     it 'prints the status' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(:status => 200, :body => @status_response_body, :headers => {})
+        .to_return(status: 200, body: @status_response_body, headers: {})
 
       status = NonstandardPooler.status(false, @nspooler_url)
       expect(status).to be_an_instance_of Hash
@@ -231,7 +232,7 @@ describe NonstandardPooler do
 
     it 'prints the summary' do
       stub_request(:get, "#{@nspooler_url}/summary")
-        .to_return(:status => 200, :body => @status_response_body, :headers => {})
+        .to_return(status: 200, body: @status_response_body, headers: {})
 
       summary = NonstandardPooler.summary(false, @nspooler_url)
       expect(summary).to be_an_instance_of Hash
@@ -256,7 +257,7 @@ describe NonstandardPooler do
 
     it 'makes a query about a vm' do
       stub_request(:get, "#{@nspooler_url}/host/sol10-11")
-        .to_return(:status => 200, :body => @query_response_body, :headers => {})
+        .to_return(status: 200, body: @query_response_body, headers: {})
 
       query_req = NonstandardPooler.query(false, @nspooler_url, 'sol10-11')
       expect(query_req).to be_an_instance_of Hash
@@ -271,8 +272,8 @@ describe NonstandardPooler do
 
     it 'deletes a single existing vm' do
       stub_request(:delete, "#{@nspooler_url}/host/sol11-7")
-        .with(:headers => @auth_token_headers)
-        .to_return(:status => 200, :body => @delete_response_success, :headers => {})
+        .with(headers: @auth_token_headers)
+        .to_return(status: 200, body: @delete_response_success, headers: {})
 
       request = NonstandardPooler.delete(false, @nspooler_url, 'sol11-7', 'token-value', nil)
       expect(request['sol11-7']['ok']).to be true
@@ -280,8 +281,8 @@ describe NonstandardPooler do
 
     it 'does not delete a nonexistant vm' do
       stub_request(:delete, "#{@nspooler_url}/host/fakehost")
-        .with(:headers => @auth_token_headers)
-        .to_return(:status => 401, :body => @delete_response_failure, :headers => {})
+        .with(headers: @auth_token_headers)
+        .to_return(status: 401, body: @delete_response_failure, headers: {})
 
       request = NonstandardPooler.delete(false, @nspooler_url, 'fakehost', 'token-value', nil)
       expect(request['fakehost']['ok']).to be false

data/spec/vmfloaty/pooler_spec.rb

@@ -15,7 +15,7 @@ describe Pooler do
 
     it 'returns a hash with operating systems from the pooler' do
       stub_request(:get, "#{@vmpooler_url}/vm")
-        .to_return(:status => 200, :body => @list_response_body, :headers => {})
+        .to_return(status: 200, body: @list_response_body, headers: {})
 
       list = Pooler.list(false, @vmpooler_url, nil)
       expect(list).to be_an_instance_of Array
@@ -23,7 +23,7 @@ describe Pooler do
 
     it 'filters operating systems based on the filter param' do
       stub_request(:get, "#{@vmpooler_url}/vm")
-        .to_return(:status => 200, :body => @list_response_body, :headers => {})
+        .to_return(status: 200, body: @list_response_body, headers: {})
 
       list = Pooler.list(false, @vmpooler_url, 'deb')
       expect(list).to be_an_instance_of Array
@@ -32,7 +32,7 @@ describe Pooler do
 
     it 'returns nothing if the filter does not match' do
       stub_request(:get, "#{@vmpooler_url}/vm")
-        .to_return(:status => 200, :body => @list_response_body, :headers => {})
+        .to_return(status: 200, body: @list_response_body, headers: {})
 
       list = Pooler.list(false, @vmpooler_url, 'windows')
       expect(list).to be_an_instance_of Array
@@ -48,8 +48,8 @@ describe Pooler do
 
     it 'raises an AuthError if the token is invalid' do
       stub_request(:post, "#{@vmpooler_url}/vm/debian-7-i386")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 401, :body => '{"ok":false}', :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 401, body: '{"ok":false}', headers: {})
 
       vm_hash = {}
       vm_hash['debian-7-i386'] = 1
@@ -58,8 +58,8 @@ describe Pooler do
 
     it 'retrieves a single vm with a token' do
       stub_request(:post, "#{@vmpooler_url}/vm/debian-7-i386")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @retrieve_response_body_single, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 200, body: @retrieve_response_body_single, headers: {})
 
       vm_hash = {}
       vm_hash['debian-7-i386'] = 1
@@ -71,8 +71,8 @@ describe Pooler do
 
     it 'retrieves a multiple vms with a token' do
       stub_request(:post, "#{@vmpooler_url}/vm/debian-7-i386+debian-7-i386+centos-7-x86_64")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @retrieve_response_body_double, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 200, body: @retrieve_response_body_double, headers: {})
 
       vm_hash = {}
       vm_hash['debian-7-i386'] = 2
@@ -89,11 +89,11 @@ describe Pooler do
       let(:ondemand_response) { '{"ok":true,"request_id":"1234"}' }
       it 'retreives the vm with a token' do
         stub_request(:post, "#{@vmpooler_url}/ondemandvm/debian-7-i386")
-          .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-          .to_return(:status => 200, :body => ondemand_response, :headers => {})
+          .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+          .to_return(status: 200, body: ondemand_response, headers: {})
 
         stub_request(:get, "#{@vmpooler_url}/ondemandvm/1234")
-          .to_return(:status => 200, :body => @retrieve_response_body_single, :headers => {})
+          .to_return(status: 200, body: @retrieve_response_body_single, headers: {})
 
         vm_hash = {}
         vm_hash['debian-7-i386'] = 1
@@ -117,11 +117,11 @@ describe Pooler do
     end
 
     it 'modifies the TTL of a vm' do
-      modify_hash = { :lifetime => 12 }
+      modify_hash = { lifetime: 12 }
       stub_request(:put, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6")
-        .with(:body    => { '{"lifetime":12}' => true },
-              :headers => { 'Content-Type' => 'application/x-www-form-urlencoded', 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @modify_response_body_success, :headers => {})
+        .with(body: { '{"lifetime":12}' => nil },
+              headers: get_headers(content_type: 'application/x-www-form-urlencoded', token: 'mytokenfile'))
+        .to_return(status: 200, body: @modify_response_body_success, headers: {})
 
       modify_req = Pooler.modify(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile', modify_hash)
       expect(modify_req['ok']).to be true
@@ -136,8 +136,8 @@ describe Pooler do
 
     it 'deletes a specified vm' do
       stub_request(:delete, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @delete_response_body_success, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 200, body: @delete_response_body_success, headers: {})
 
       expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile', nil)).to eq @delete_response
     end
@@ -155,7 +155,7 @@ describe Pooler do
 
     it 'prints the status' do
       stub_request(:get, "#{@vmpooler_url}/status")
-        .to_return(:status => 200, :body => @status_response_body, :headers => {})
+        .to_return(status: 200, body: @status_response_body, headers: {})
 
       status = Pooler.status(false, @vmpooler_url)
       expect(status).to be_an_instance_of Hash
@@ -178,7 +178,7 @@ describe Pooler do
 
     it 'makes a query about a vm' do
       stub_request(:get, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6")
-        .to_return(:status => 200, :body => @query_response_body, :headers => {})
+        .to_return(status: 200, body: @query_response_body, headers: {})
 
       query_req = Pooler.query(false, @vmpooler_url, 'fq6qlpjlsskycq6')
       expect(query_req).to be_an_instance_of Hash
@@ -192,8 +192,8 @@ describe Pooler do
 
     it 'makes a snapshot for a single vm' do
       stub_request(:post, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6/snapshot")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @snapshot_response_body, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 200, body: @snapshot_response_body, headers: {})
 
       snapshot_req = Pooler.snapshot(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile')
       expect(snapshot_req['ok']).to be true
@@ -207,15 +207,18 @@ describe Pooler do
 
     it 'makes a request to revert a vm from a snapshot' do
       stub_request(:post, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6/snapshot/dAfewKNfaweLKNve")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
-        .to_return(:status => 200, :body => @revert_response_body, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' })
+        .to_return(status: 200, body: @revert_response_body, headers: {})
 
       revert_req = Pooler.revert(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile', 'dAfewKNfaweLKNve')
       expect(revert_req['ok']).to be true
     end
 
     it "doesn't make a request to revert a vm if snapshot is not provided" do
-      expect { Pooler.revert(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile', nil) }.to raise_error(RuntimeError, 'Snapshot SHA provided was nil, could not revert fq6qlpjlsskycq6')
+      expect do
+        Pooler.revert(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile',
+                      nil)
+      end.to raise_error(RuntimeError, 'Snapshot SHA provided was nil, could not revert fq6qlpjlsskycq6')
     end
 
     it 'raises a TokenError if no token was provided' do
@@ -231,7 +234,7 @@ describe Pooler do
 
     it 'makes a request to extend disk space of a vm' do
       stub_request(:post, "#{@vmpooler_url}/vm/fq6qlpjlsskycq6/disk/12")
-        .with(:headers => { 'X-Auth-Token' => 'mytokenfile' }). to_return(:status => 200, :body => @disk_response_body_success, :headers => {})
+        .with(headers: { 'X-Auth-Token' => 'mytokenfile' }).to_return(status: 200, body: @disk_response_body_success, headers: {})
 
       disk_req = Pooler.disk(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile', 12)
       expect(disk_req['ok']).to be true