Adding command to get vms from abs

Author: mikkergimenez

README.md

@@ -53,7 +53,7 @@ $ floaty --help
 Grabbing a token for authenticated pooler requests:
 
 ```
-floaty token get --user username --url https://vmpooler.example.net/api/v1
+floaty token get --user username --url https://vmpooler.example.net/api/v1 --api (vmpooler|abs)
 ```
 
 This command will then ask you to log in. If successful, it will return a token that you can save either in a dotfile or use with other cli commands.
@@ -66,7 +66,7 @@ floaty get centos-7-x86_64=2 debian-7-x86_64 windows-10=3 --token mytokenstring
 
 ### vmfloaty dotfile
 
-If you do not wish to continuely specify various config options with the cli, you can have a dotfile in your home directory for some defaults. For example:
+If you do not wish to continually specify various config options with the cli, you can have a dotfile in your home directory for some defaults. For example:
 
 #### Basic configuration
 
@@ -135,6 +135,7 @@ services:
     url: 'https://abs.example.net/api/v2'
     token: 'abs-tokenstring'
     type: 'abs'  # <-- 'type' is necessary for any non-vmpooler service
+
 ```
 
 With this configuration, you could list available OS types from nspooler like this:

lib/vmfloaty.rb

@@ -84,6 +84,7 @@ def run
       c.option '--url STRING', String, 'URL of pooler service'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
+
         service = Service.new(options, config)
         filter = args[0]
 

lib/vmfloaty/abs.rb

@@ -13,6 +13,7 @@ def self.list(verbose, url, os_filter = nil)
     os_list = []
 
     response = conn.get 'status/platforms/vmpooler'
+
     response_body = JSON.parse(response.body)
     os_list << "*** VMPOOLER Pools ***"
     os_list = os_list + JSON.parse(response_body["vmpooler_platforms"])
@@ -31,8 +32,6 @@ def self.list(verbose, url, os_filter = nil)
 
     os_list.delete 'ok'
 
-    puts os_list
-
     os_filter ? os_list.select { |i| i[/#{os_filter}/] } : os_list
   end
 
@@ -42,23 +41,72 @@ def self.list_active(verbose, url, token)
     status['reserved_hosts'] || []
   end
 
-  def self.retrieve(verbose, os_type, token, url)
+  # Retrieve an OS from ABS.
+  def self.retrieve(verbose, os_types, token, url, user)
+    #
+    # Contents of post must be:j
+    #
+    # {
+    #   "resources": {
+    #     "centos-7-i386": 1,
+    #     "ubuntu-1404-x86_64": 2
+    #   },
+    #   "job": {
+    #     "id": "12345",
+    #     "tags": {
+    #       "user": "jenkins",
+    #       "jenkins_build_url": "https://jenkins/job/platform_puppet_intn-van-sys_master"
+    #     }
+    #   }
+    # }
+
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token if token
 
-    os_string = os_type.map { |os, num| Array(os) * num }.flatten.join('+')
-    raise MissingParamError, 'No operating systems provided to obtain.' if os_string.empty?
+    saved_job_id = Time.now.to_i
 
-    response = conn.post "host/#{os_string}"
+    reqObj = {
+      resources: os_types,
+      job: {
+        id: Time.now.to_i,
+        tags: {
+          user: user,
+          url_string: "floaty://#{user}/#{Time.now.to_i}"
+        }
+      }
+    }
 
-    res_body = JSON.parse(response.body)
+    # os_string = os_type.map { |os, num| Array(os) * num }.flatten.join('+')
+    # raise MissingParamError, 'No operating systems provided to obtain.' if os_string.empty?
+    response = conn.post "api/v2/request", reqObj.to_json
 
-    if res_body['ok']
-      res_body
-    elsif response.status == 401
+    i = 0
+    retries = 10
+
+    if response.status == 401
       raise AuthError, "HTTP #{response.status}: The token provided could not authenticate to the pooler.\n#{res_body}"
-    else
-      raise "HTTP #{response.status}: Failed to obtain VMs from the pooler at #{url}/host/#{os_string}. #{res_body}"
+    end
+
+
+    while true
+      queue_info_response = conn.get "/status/queue/info/#{saved_job_id}"
+      queue_info = JSON.parse(queue_info_response.body)
+
+      response = conn.post "request", reqObj.to_json
+      i = i.to_i + 1
+
+      break if i > retries
+
+      if response.body.length > 0
+        res_body = JSON.parse(response.body)
+
+        puts "Returning #{res_body.length} vms: "
+        puts res_body
+        break
+      end
+
+      puts "Waiting 10 seconds to check if ABS request has been filled.  Queue Position: #{queue_info["queue_place"]}... (x#{i})"
+      sleep(10)
     end
   end
 

lib/vmfloaty/nonstandard_pooler.rb

@@ -22,7 +22,7 @@ def self.list_active(verbose, url, token)
     status['reserved_hosts'] || []
   end
 
-  def self.retrieve(verbose, os_type, token, url)
+  def self.retrieve(verbose, os_type, token, url, user)
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token if token
 

lib/vmfloaty/service.rb

@@ -36,7 +36,7 @@ def type
 
   def user
     unless @config['user']
-      puts 'Enter your pooler service username:'
+      puts "Enter your #{@config["url"]} service username:"
       @config['user'] = STDIN.gets.chomp
     end
     @config['user']
@@ -58,7 +58,7 @@ def get_new_token(verbose)
 
   def delete_token(verbose, token_value = @config['token'])
     username = user
-    pass = Commander::UI.password 'Enter your pooler service password:', '*'
+    pass = Commander::UI.password "Enter your #{@config["url"]} service password:", '*'
     Auth.delete_token(verbose, url, username, pass, token_value)
   end
 
@@ -78,7 +78,7 @@ def list_active(verbose)
   def retrieve(verbose, os_types, use_token = true)
     puts 'Requesting a vm without a token...' unless use_token
     token_value = use_token ? token : nil
-    @service_object.retrieve verbose, os_types, token_value, url
+    @service_object.retrieve verbose, os_types, token_value, url, user
   end
 
   def ssh(verbose, host_os, use_token = true)

spec/vmfloaty/abs/auth_spec.rb

@@ -5,7 +5,7 @@
 
 describe Pooler do
   before :each do
-    @abs_url = 'https://abs.example.com'
+    @abs_url = 'https://abs.example.com/api/v2'
   end
 
   describe '#get_token' do
@@ -15,17 +15,17 @@
     end
 
     it 'returns a token from vmpooler' do
-      stub_request(:post, 'https://first.last:[email protected]/api/v2/token')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length' => '0', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:post, "#{@abs_url}/token")
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Basic Zmlyc3QubGFzdDpwYXNzd29yZA==', 'Content-Length'=>'0'})
         .to_return(:status => 200, :body => @get_token_response, :headers => {})
 
       token = Auth.get_token(false, @abs_url, 'first.last', 'password')
       expect(token).to eq @token
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:post, 'https://first.last:[email protected]/api/v2/token')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length' => '0', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:post, "#{@abs_url}/token")
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Basic Zmlyc3QubGFzdDpwYXNzd29yZA==', 'Content-Length'=>'0'})
         .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
       expect { Auth.get_token(false, @abs_url, 'first.last', 'password') }.to raise_error(TokenError)
@@ -39,16 +39,16 @@
     end
 
     it 'deletes the specified token' do
-      stub_request(:delete, 'https://first.last:[email protected]/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
-        .to_return(:status => 200, :body => @delete_token_response, :headers => {})
+      stub_request(:delete, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
+         .with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Basic Zmlyc3QubGFzdDpwYXNzd29yZA=='})
+         .to_return(:status => 200, :body => @delete_token_response, :headers => {})
 
       expect(Auth.delete_token(false, @abs_url, 'first.last', 'password', @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:[email protected]/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:delete, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'})
         .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
       expect { Auth.delete_token(false, @abs_url, 'first.last', 'password', @token) }.to raise_error(TokenError)
@@ -67,15 +67,15 @@
 
     it 'checks the status of a token' do
       stub_request(:get, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'})
         .to_return(:status => 200, :body => @token_status_response, :headers => {})
 
       expect(Auth.token_status(false, @abs_url, @token)).to eq JSON.parse(@token_status_response)
     end
 
     it 'raises a token error if something goes wrong' do
       stub_request(:get, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'})
         .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
       expect { Auth.token_status(false, @abs_url, @token) }.to raise_error(TokenError)

spec/vmfloaty/auth_spec.rb

@@ -15,17 +15,17 @@
     end
 
     it 'returns a token from vmpooler' do
-      stub_request(:post, 'https://first.last:password@vmpooler.example.com/token')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length' => '0', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:post, 'https://vmpooler.example.com/token')
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length' => '0' })
         .to_return(:status => 200, :body => @get_token_response, :headers => {})
 
       token = Auth.get_token(false, @vmpooler_url, 'first.last', 'password')
       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')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length' => '0', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:post, 'https://vmpooler.example.com/token')
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', '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)
@@ -39,16 +39,16 @@
     end
 
     it 'deletes the specified token' do
-      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:delete, 'https://vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
         .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)
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+      stub_request(:delete, 'https://vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
         .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
       expect { Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', @token) }.to raise_error(TokenError)
@@ -67,15 +67,15 @@
 
     it 'checks the status of a token' do
       stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
         .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")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent' => 'Faraday v0.9.2' })
+        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
         .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
       expect { Auth.token_status(false, @vmpooler_url, @token) }.to raise_error(TokenError)

spec/vmfloaty/nonstandard_pooler_spec.rb

@@ -11,13 +11,11 @@
     @post_request_headers = {
       'Accept'          => '*/*',
       'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent'      => 'Faraday v0.9.2',
       'X-Auth-Token'    => 'token-value',
     }
     @get_request_headers = {
       'Accept'          => '*/*',
       'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent'      => 'Faraday v0.9.2',
       'X-Auth-Token'    => 'token-value',
     }
     @get_request_headers_notoken = @get_request_headers.tap do |headers|
@@ -137,7 +135,7 @@
         .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) }.to raise_error(AuthError)
+      expect { NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, "first.last") }.to raise_error(AuthError)
     end
 
     it 'retrieves a single vm with a token' do
@@ -146,7 +144,7 @@
         .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)
+      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-11-sparc']['hostname']).to eq 'sol11-4.delivery.puppetlabs.net'
@@ -158,7 +156,7 @@
         .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)
+      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
@@ -175,18 +173,18 @@
     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 => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => 'Faraday v0.9.2', 'X-Auth-Token' => 'token-value' })
+              :headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type' => 'application/x-www-form-urlencoded', 'X-Auth-Token' => 'token-value' })
         .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 => @post_request_headers)
+              :headers => @post_request_headers.merge({'Content-Type'=>'application/x-www-form-urlencoded'}))
         .to_return(:status => 200, :body => '{"ok": true}', :headers => {})
 
       modify_hash = { :reason => 'testing' }