Raise TokenError if none provided to Pooler.delete

This commit is contained in:
Brian Cain 2016-11-14 09:49:23 -08:00
parent 97e188cf6d
commit a6ff0515d3
3 changed files with 16 additions and 1 deletions

View file

@ -336,7 +336,14 @@ class Vmfloaty
exit 1 exit 1
else else
hosts = hostnames.split(',') hosts = hostnames.split(',')
begin
Pooler.delete(verbose, url, hosts, token) Pooler.delete(verbose, url, hosts, token)
rescue TokenError => e
STDERR.puts e
exit 1
end
puts "Schedulered vmpooler to delete vms #{hosts}."
exit 0 exit 0
end end
end end

View file

@ -94,6 +94,10 @@ class Pooler
end end
def self.delete(verbose, url, hosts, token) def self.delete(verbose, url, hosts, token)
if token.nil?
raise TokenError, "Token provided was nil. Request cannot be made to delete vm"
end
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, url)
if token if token

View file

@ -118,6 +118,10 @@ describe Pooler do
expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile')).to eq @delete_response expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile')).to eq @delete_response
end end
it "raises a token error if no token provided" do
expect{ Pooler.delete(false, @vmpooler_url, ['myfakehost'], nil) }.to raise_error(TokenError)
end
end end
describe "#status" do describe "#status" do