vmfloaty 0.11.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebdafe4b60af0f238330584cbe7ee1a3a5258b1671b7805d45551c16c69465a
-  data.tar.gz: '002138e04b43f670d76d7f0311dbb4770e2153306874a527f0e537c59dfafc9e'
+  metadata.gz: 4cf673c0a3e005fc4ef5102d232206f3105215de4f19cd76725de335b62937fd
+  data.tar.gz: e4791593e75d31d42a8f05cfb28b3655e42218ac1a7191ae1c8391ccdad5133b
 SHA512:
-  metadata.gz: 23e7ea9dbb546740ea16418f7a5e00d184df44634bf5dc9ff5421907a7fac55ff65d7d74516f1762a805cf865ff941b97e474e20db101029b176b89f1946d662
-  data.tar.gz: 7ffa31b013b4d332a6e19f56b56a6f55560dbc6a65702cf1b81be7317bc1b59b434af674f7f54ddb13f4dc611e96e27c947aa6c4679031f32b3475b49c1e5e40
+  metadata.gz: b22ad1332f3a663407a6ce964525606938134925e0b91ccd151a8f9a4abc265cab53cddd9509ce92555abb357dc213f2beef50a02ea72eb501db31c9e3936983
+  data.tar.gz: 8436c38cc6a99b76c4e65da0dfa653edbbdbe9b7fcefb9607942983cd24014c40ab14f556b06e7d6a449dc57f84740e09df2668e15129cdb5dccbb3b6e746eff

data/README.md

@@ -14,9 +14,8 @@ A CLI helper tool for [Puppet's vmpooler](https://github.com/puppetlabs/vmpooler
   - [Example workflow](#example-workflow)
   - [vmfloaty dotfile](#vmfloaty-dotfile)
     - [Basic configuration](#basic-configuration)
-    - [Default to Puppet's ABS instead of vmpooler](#default-to-puppets-abs-instead-of-vmpooler)
-    - [Configuring multiple services](#configuring-multiple-services)
-    - [Using a Nonstandard Pooler service](#using-a-nonstandard-pooler-service)
+    - [Using multiple services](#using-multiple-services)
+    - [Using backends besides VMPooler](#using-backends-besides-vmpooler)
     - [Valid config keys](#valid-config-keys)
   - [Tab Completion](#tab-completion)
 - [vmpooler API](#vmpooler-api)
@@ -54,6 +53,7 @@ $ floaty --help
     modify     Modify a VM's tags, time to live, disk space, or reservation reason
     query      Get information about a given vm
     revert     Reverts a vm to a specified snapshot
+    service    Display information about floaty services and their configuration
     snapshot   Takes a snapshot of a given vm
     ssh        Grabs a single vm and sshs into it
     status     Prints the status of pools in the pooler service
@@ -90,95 +90,32 @@ floaty get centos-7-x86_64=2 debian-7-x86_64 windows-10=3 --token mytokenstring
 
 ### vmfloaty dotfile
 
-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:
+If you do not wish to continually specify various config options with the cli, you can `~/.vmfloaty.yml` for some defaults. You can get a list of valid service types and example configuration files via `floaty service types` and `floaty service examples`, respectively.
 
 #### Basic configuration
 
-```yaml
-# file at ~/.vmfloaty.yml
-url: 'https://vmpooler.example.net/api/v1'
-user: 'brian'
-token: 'tokenstring'
-```
-
-Now vmfloaty will use those config files if no flag was specified.
-
-#### Default to Puppet's ABS instead of vmpooler
+This is the simplest type of configuration where you only need a single service:
 
 ```yaml
 # file at ~/.vmfloaty.yml
-url: 'https://abs.example.net'
+url: 'https://vmpooler.example.net/api/v1'
 user: 'brian'
 token: 'tokenstring'
-type: 'abs'
 ```
 
-#### Configuring multiple services
+Run `floaty service examples` to see additional configuration options
 
-Most commands allow you to specify a `--service <servicename>` option to allow the use of multiple vmpooler instances. This can be useful when you'd rather not specify a `--url` or `--token` by hand for alternate services.
+#### Using multiple services
 
-To configure multiple services, you can set up your `~/.vmfloaty.yml` config file like this:
-
-```yaml
-# file at /Users/me/.vmfloaty.yml
-user: 'brian'
-services:
-  main:
-    url: 'https://vmpooler.example.net/api/v1'
-    token: 'tokenstring'
-  alternate:
-    url: 'https://vmpooler.example.com/api/v1'
-    token: 'alternate-tokenstring'
-```
+Most commands allow you to specify a `--service <servicename>` option to allow the use of multiple pooler instances. This can be useful when you'd rather not specify a `--url` or `--token` by hand for alternate services.
 
 - If you run `floaty` without a `--service <name>` option, vmfloaty will use the first configured service by default.
-  With the config file above, the default would be to use the 'main' vmpooler instance.
 - If keys are missing for a configured service, vmfloaty will attempt to fall back to the top-level values.
-  With the config file above, 'brian' will be used as the username for both configured services, since neither specifies a username.
-
-Examples using the above configuration:
-
-List available vm types from our main vmpooler instance:
-
-```bash
-floaty list --service main
-# or, since the first configured service is used by default:
-floaty list
-```
-
-List available vm types from our alternate vmpooler instance:
-
-```bash
-floaty list --service alternate
-```
+  This makes it so you can specify things like `user` once at the top of your `~/.vmfloaty.yml`.
 
-#### Using a Nonstandard Pooler service
+#### Using backends besides VMPooler
 
-vmfloaty is capable of working with Puppet's [nonstandard pooler](https://github.com/puppetlabs/nspooler) in addition to the default vmpooler API. To add a nonstandard pooler service, specify an API `type` value in your service configuration, like this:
-
-```yaml
-# file at /Users/me/.vmfloaty.yml
-user: 'brian'
-services:
-  vm:
-    url: 'https://vmpooler.example.net/api/v1'
-    token: 'tokenstring'
-  ns:
-    url: 'https://nspooler.example.net/api/v1'
-    token: 'nspooler-tokenstring'
-    type: 'nonstandard'  # <-- 'type' is necessary for any non-vmpooler service
-  abs:
-    url: 'https://abs.example.net/'
-    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:
-
-```bash
-floaty list --service ns
-```
+vmfloaty supports additional backends besides VMPooler. To see a complete list, run `floaty service types`. The output of `floaty service examples` will show you how to configure each of the supported backends.
 
 #### Valid config keys
 
@@ -190,6 +127,7 @@ Here are the keys that vmfloaty currently supports:
 - url (String)
 - services (String)
 - type (String)
+- vmpooler_fallback (String)
 
 ### Tab Completion
 
@@ -207,6 +145,12 @@ If you are running on macOS and use Homebrew's `bash-completion` formula, you ca
 ln -s $(floaty completion --shell bash) /usr/local/etc/bash_completion.d/floaty
 ```
 
+There is also tab completion for zsh:
+
+```zsh
+source $(floaty completion --shell zsh)
+```
+
 ## vmpooler API
 
 This cli tool uses the [vmpooler API](https://github.com/puppetlabs/vmpooler/blob/master/API.md).

data/extras/completions/floaty.bash

@@ -7,7 +7,7 @@ _vmfloaty()
   cur="${COMP_WORDS[COMP_CWORD]}"
   prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-  subcommands="delete get help list modify query revert snapshot ssh status summary token"
+  subcommands="delete get help list modify query revert service snapshot ssh status summary token"
   template_subcommands="get ssh"
   hostname_subcommands="delete modify query revert snapshot"
 
@@ -21,7 +21,7 @@ _vmfloaty()
 
     COMPREPLY=( $(compgen -W "${_vmfloaty_avail_templates}" -- "${cur}") )
   elif [[ $hostname_subcommands =~ (^| )$prev($| ) ]] ; then
-    _vmfloaty_active_hostnames=$(floaty list --active 2>/dev/null | grep '^-' | cut -d' ' -f2)
+    _vmfloaty_active_hostnames=$(floaty list --active --hostnameonly 2>/dev/null)
     COMPREPLY=( $(compgen -W "${_vmfloaty_active_hostnames}" -- "${cur}") )
   else
     COMPREPLY=( $(compgen -W "${subcommands}" -- "${cur}") )

data/extras/completions/floaty.zsh

@@ -0,0 +1,37 @@
+_floaty()
+{
+  local line subcommands template_subcommands hostname_subcommands
+
+  subcommands="delete get help list modify query revert snapshot ssh status summary token"
+
+  template_subcommands=("get" "ssh")
+  hostname_subcommands=("delete" "modify" "query" "revert" "snapshot")
+
+  _arguments -C \
+    "1: :(${subcommands})" \
+    "*::arg:->args"
+
+  if ((template_subcommands[(Ie)$line[1]])); then
+    _floaty_template_sub
+  elif ((hostname_subcommands[(Ie)$line[1]])); then
+    _floaty_hostname_sub
+  fi
+}
+
+_floaty_template_sub()
+{
+  if [[ -z "$_vmfloaty_avail_templates" ]] ; then
+    _vmfloaty_avail_templates=$(floaty list 2>/dev/null)
+  fi
+
+  _arguments "1: :(${_vmfloaty_avail_templates})"
+}
+
+_floaty_hostname_sub()
+{
+  _vmfloaty_active_hostnames=$(floaty list --active --hostnameonly 2>/dev/null)
+
+  _arguments "1: :(${_vmfloaty_active_hostnames})"
+}
+
+compdef _floaty floaty

data/lib/vmfloaty.rb

@@ -20,7 +20,7 @@ class Vmfloaty
 
   def run # rubocop:disable Metrics/AbcSize
     program :version, Vmfloaty::VERSION
-    program :description, "A CLI helper tool for Puppet's vmpooler to help you stay afloat"
+    program :description, "A CLI helper tool for Puppet's vmpooler to help you stay afloat.\n\nConfiguration may be placed in a ~/.vmfloaty.yml file."
 
     config = Conf.read_config
 
@@ -88,8 +88,10 @@ class Vmfloaty
       c.option '--service STRING', String, 'Configured pooler service name'
       c.option '--active', 'Prints information about active vms for a given token'
       c.option '--json', 'Prints information as JSON'
+      c.option '--hostnameonly', 'When listing active vms, prints only hostnames, one per line'
       c.option '--token STRING', String, 'Token for pooler service'
       c.option '--url STRING', String, 'URL of pooler service'
+      c.option '--user STRING', String, 'User to authenticate with'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
 
@@ -98,7 +100,12 @@ class Vmfloaty
 
         if options.active
           # list active vms
-          running_vms = service.list_active(verbose)
+          if service.type == "ABS"
+            # this is actually job_ids
+            running_vms = service.list_active_job_ids(verbose, service.url, service.user)
+          else
+            running_vms = service.list_active(verbose)
+          end
           host = URI.parse(service.url).host
           if running_vms.empty?
             if options.json
@@ -109,6 +116,10 @@ class Vmfloaty
           else
             if options.json
               puts Utils.get_host_data(verbose, service, running_vms).to_json
+            elsif options.hostnameonly
+              Utils.get_host_data(verbose, service, running_vms).each do |hostname, host_data|
+                Utils.print_fqdn_for_host(service, hostname, host_data)
+              end
             else
               puts "Your VMs on #{host}:"
               Utils.pretty_print_hosts(verbose, service, running_vms)
@@ -125,7 +136,7 @@ class Vmfloaty
     command :query do |c|
       c.syntax = 'floaty query hostname [options]'
       c.summary = 'Get information about a given vm'
-      c.description = 'Given a hostname from the pooler service, vmfloaty with query the service to get various details about the vm.'
+      c.description = 'Given a hostname from the pooler service, vmfloaty with query the service to get various details about the vm. If using ABS, you can query a job_id'
       c.example 'Get information about a sample host', 'floaty query hostname --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--service STRING', String, 'Configured pooler service name'
@@ -164,7 +175,12 @@ class Vmfloaty
           FloatyLogger.error 'ERROR: Provide a hostname or specify --all.'
           exit 1
         end
-        running_vms = modify_all ? service.list_active(verbose) : hostname.split(',')
+        running_vms =
+            if modify_all
+              service.list_active(verbose)
+            else
+              hostname.split(',')
+            end
 
         tags = options.tags ? JSON.parse(options.tags) : nil
         modify_hash = {
@@ -188,7 +204,7 @@ class Vmfloaty
           end
           if ok
             if modify_all
-              puts 'Successfully modified all VMs.'
+              puts "Successfully modified all #{running_vms.count} VMs."
             else
               puts "Successfully modified VM #{hostname}."
             end
@@ -212,6 +228,7 @@ class Vmfloaty
       c.option '--json', 'Outputs hosts scheduled for deletion as JSON'
       c.option '--token STRING', String, 'Token for pooler service'
       c.option '--url STRING', String, 'URL of pooler service'
+      c.option '--user STRING', String, 'User to authenticate with'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         service = Service.new(options, config)
@@ -223,7 +240,12 @@ class Vmfloaty
         successes = []
 
         if delete_all
-          running_vms = service.list_active(verbose)
+          if service.type == "ABS"
+            # this is actually job_ids
+            running_vms = service.list_active_job_ids(verbose, service.url, service.user)
+          else
+            running_vms = service.list_active(verbose)
+          end
           if running_vms.empty?
             if options.json
               puts {}.to_json
@@ -272,7 +294,6 @@ class Vmfloaty
         end
 
         unless successes.empty?
-          FloatyLogger.info unless failures.empty?
           if options.json
             puts successes.to_json
           else
@@ -481,6 +502,70 @@ class Vmfloaty
       end
     end
 
+    command :service do |c|
+      c.syntax = 'floaty service <types examples>'
+      c.summary = 'Display information about floaty services and their configuration'
+      c.description = 'Display information about floaty services to aid in setting up a configuration file.'
+      c.example 'Print a list of the valid service types', 'floaty service types'
+      c.example 'Print a sample config file with multiple services', 'floaty service examples'
+      c.example 'list vms from the service named "nspooler-prod"', 'floaty list --service nspooler-prod'
+      c.action do |args, options|
+        action = args.first
+
+        example_config = Utils.strip_heredoc(<<-CONFIG)
+          # Sample ~/.vmfloaty.yml with just vmpooler
+          user: 'jdoe'
+          url: 'https://vmpooler.example.net'
+          token: '456def789'
+
+          # Sample ~/.vmfloaty.yml with multiple services
+          # Note: when the --service is not specified on the command line,
+          # the first service listed here is selected automatically
+          user: 'jdoe'
+          services:
+            abs-prod:
+              type: 'abs'
+              url: 'https://abs.example.net/api/v2'
+              token: '123abc456'
+              vmpooler_fallback: 'vmpooler-prod'
+            nspooler-prod:
+              type: 'nspooler'
+              url: 'https://nspooler.example.net'
+              token:  '789ghi012'
+            vmpooler-dev:
+              type: 'vmpooler'
+              url: 'https://vmpooler-dev.example.net'
+              token: '987dsa654'
+            vmpooler-prod:
+              type: 'vmpooler'
+              url: 'https://vmpooler.example.net'
+              token: '456def789'
+
+        CONFIG
+
+        types_output = Utils.strip_heredoc(<<-TYPES)
+          The values on the left below can be used in ~/.vmfloaty.yml as the value of type:
+
+          abs:       Puppet's Always Be Scheduling
+          nspooler:  Puppet's Non-standard Pooler, aka NSPooler
+          vmpooler:  Puppet's VMPooler
+        TYPES
+
+        case action
+        when 'examples'
+          FloatyLogger.info example_config
+        when 'types'
+          FloatyLogger.info types_output
+        when nil
+          FloatyLogger.error 'No action provided'
+          exit 1
+        else
+          FloatyLogger.error "Unknown action: #{action}"
+          exit 1
+        end
+      end
+    end
+
     run!
   end
 end

data/lib/vmfloaty/abs.rb

@@ -2,6 +2,7 @@
 
 require 'vmfloaty/errors'
 require 'vmfloaty/http'
+require 'vmfloaty/utils'
 require 'faraday'
 require 'json'
 
@@ -36,39 +37,61 @@ class ABS
   #       }
   #     }
   #
-
   @active_hostnames = {}
 
-  def self.list_active(verbose, url, _token, user)
-    all_jobs = []
+  def self.list_active_job_ids(verbose, url, user)
+    all_job_ids = []
     @active_hostnames = {}
+    get_active_requests(verbose, url, user).each do |req_hash|
+      @active_hostnames[req_hash['request']['job']['id']] = req_hash # full hash saved for later retrieval
+      all_job_ids.push(req_hash['request']['job']['id'])
+    end
+
+    all_job_ids
+  end
 
+  def self.list_active(verbose, url, _token, user)
+    hosts = []
     get_active_requests(verbose, url, user).each do |req_hash|
-      all_jobs.push(req_hash['request']['job']['id'])
-      @active_hostnames[req_hash['request']['job']['id']] = req_hash
+      if req_hash.key?('allocated_resources')
+        req_hash['allocated_resources'].each do |onehost|
+          hosts.push(onehost['hostname'])
+        end
+      end
     end
 
-    all_jobs
+    hosts
   end
 
   def self.get_active_requests(verbose, url, user)
     conn = Http.get_conn(verbose, url)
     res = conn.get 'status/queue'
-    requests = JSON.parse(res.body)
+    if valid_json?(res.body)
+      requests = JSON.parse(res.body)
+    else
+      FloatyLogger.warn "Warning: couldn't parse body returned from abs/status/queue"
+    end
 
     ret_val = []
 
     requests.each do |req|
       next if req == 'null'
 
-      req_hash = JSON.parse(req)
+      if valid_json?(req) # legacy ABS had another JSON string always-be-scheduling/pull/306
+        req_hash = JSON.parse(req)
+      elsif req.is_a?(Hash)
+        req_hash = req
+      else
+        FloatyLogger.warn "Warning: couldn't parse request returned from abs/status/queue"
+        next
+      end
 
       begin
         next unless user == req_hash['request']['job']['user']
 
         ret_val.push(req_hash)
       rescue NoMethodError
-        FloatyLogger.warn "Warning: couldn't parse line returned from abs/status/queue: "
+        FloatyLogger.warn "Warning: couldn't parse user returned from abs/status/queue: "
       end
     end
 
@@ -145,30 +168,59 @@ class ABS
     os_list = []
 
     res = conn.get 'status/platforms/vmpooler'
-
-    res_body = JSON.parse(res.body)
-    os_list << '*** VMPOOLER Pools ***'
-    os_list += JSON.parse(res_body['vmpooler_platforms'])
+    if valid_json?(res.body)
+      res_body = JSON.parse(res.body)
+      if res_body.key?('vmpooler_platforms')
+        os_list << '*** VMPOOLER Pools ***'
+        if res_body['vmpooler_platforms'].is_a?(String)
+          os_list += JSON.parse(res_body['vmpooler_platforms']) # legacy ABS had another JSON string always-be-scheduling/pull/306
+        else
+          os_list += res_body['vmpooler_platforms']
+        end
+      end
+    end
 
     res = conn.get 'status/platforms/ondemand_vmpooler'
-    res_body = JSON.parse(res.body)
-    unless res_body['ondemand_vmpooler_platforms'] == '[]'
-      os_list << ''
-      os_list << '*** VMPOOLER ONDEMAND Pools ***'
-      os_list += JSON.parse(res_body['ondemand_vmpooler_platforms'])
+    if valid_json?(res.body)
+      res_body = JSON.parse(res.body)
+      if res_body.key?('ondemand_vmpooler_platforms') && res_body['ondemand_vmpooler_platforms'] != '[]'
+        os_list << ''
+        os_list << '*** VMPOOLER ONDEMAND Pools ***'
+        if res_body['ondemand_vmpooler_platforms'].is_a?(String)
+          os_list += JSON.parse(res_body['ondemand_vmpooler_platforms']) # legacy ABS had another JSON string always-be-scheduling/pull/306
+        else
+          os_list += res_body['ondemand_vmpooler_platforms']
+        end
+      end
     end
 
     res = conn.get 'status/platforms/nspooler'
-    res_body = JSON.parse(res.body)
-    os_list << ''
-    os_list << '*** NSPOOLER Pools ***'
-    os_list += JSON.parse(res_body['nspooler_platforms'])
+    if valid_json?(res.body)
+      res_body = JSON.parse(res.body)
+      if res_body.key?('nspooler_platforms')
+        os_list << ''
+        os_list << '*** NSPOOLER Pools ***'
+        if res_body['nspooler_platforms'].is_a?(String)
+          os_list += JSON.parse(res_body['nspooler_platforms']) # legacy ABS had another JSON string always-be-scheduling/pull/306
+        else
+          os_list += res_body['nspooler_platforms']
+        end
+      end
+    end
 
     res = conn.get 'status/platforms/aws'
-    res_body = JSON.parse(res.body)
-    os_list << ''
-    os_list << '*** AWS Pools ***'
-    os_list += JSON.parse(res_body['aws_platforms'])
+    if valid_json?(res.body)
+      res_body = JSON.parse(res.body)
+      if res_body.key?('aws_platforms')
+        os_list << ''
+        os_list << '*** AWS Pools ***'
+        if res_body['aws_platforms'].is_a?(String)
+          os_list += JSON.parse(res_body['aws_platforms']) # legacy ABS had another JSON string always-be-scheduling/pull/306
+        else
+          os_list += res_body['aws_platforms']
+        end
+      end
+    end
 
     os_list.delete 'ok'
 
@@ -176,7 +228,7 @@ class ABS
   end
 
   # Retrieve an OS from ABS.
-  def self.retrieve(verbose, os_types, token, url, user, options, _ondemand = nil)
+  def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
     #
     # Contents of post must be like:
     #
@@ -197,7 +249,7 @@ class ABS
     conn.headers['X-AUTH-TOKEN'] = token if token
 
     saved_job_id = DateTime.now.strftime('%Q')
-
+    vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
     req_obj = {
       :resources => os_types,
       :job       => {
@@ -206,17 +258,18 @@ class ABS
           :user => user,
         },
       },
+      :vm_token => vmpooler_config['token'] # request with this token, on behalf of this user
     }
 
-    if options['priority']
-      req_obj[:priority] = if options['priority'] == 'high'
+    if config['priority']
+      req_obj[:priority] = if config['priority'] == 'high'
                              1
-                           elsif options['priority'] == 'medium'
+                           elsif config['priority'] == 'medium'
                              2
-                           elsif options['priority'] == 'low'
+                           elsif config['priority'] == 'low'
                              3
                            else
-                             options['priority'].to_i
+                             config['priority'].to_i
                            end
     end
 
@@ -233,7 +286,7 @@ class ABS
 
     (1..retries).each do |i|
       queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
-      return translated(res_body) if res_body
+      return translated(res_body, saved_job_id) if res_body
 
       sleep_seconds = 10 if i >= 10
       sleep_seconds = i if i < 10
@@ -247,8 +300,8 @@ class ABS
   #
   # We should fix the ABS API to be more like the vmpooler or nspooler api, but for now
   #
-  def self.translated(res_body)
-    vmpooler_formatted_body = {}
+  def self.translated(res_body, job_id)
+    vmpooler_formatted_body = {'job_id' => job_id}
 
     res_body.each do |host|
       if vmpooler_formatted_body[host['type']] && vmpooler_formatted_body[host['type']]['hostname'].class == Array
@@ -264,12 +317,17 @@ class ABS
 
   def self.check_queue(conn, job_id, req_obj, verbose)
     queue_info_res = conn.get "status/queue/info/#{job_id}"
-    queue_info = JSON.parse(queue_info_res.body)
+    if valid_json?(queue_info_res.body)
+      queue_info = JSON.parse(queue_info_res.body)
+    else
+      FloatyLogger.warn "Could not parse the status/queue/info/#{job_id}"
+      return [nil, nil]
+    end
 
     res = conn.post 'request', req_obj.to_json
     validate_queue_status_response(res.status, res.body, "Check queue request", verbose)
 
-    unless res.body.empty?
+    unless res.body.empty? || !valid_json?(res.body)
       res_body = JSON.parse(res.body)
       return queue_info['queue_place'], res_body
     end
@@ -277,7 +335,7 @@ class ABS
   end
 
   def self.snapshot(_verbose, _url, _hostname, _token)
-    FloatyLogger.info "Can't snapshot with ABS, use '--service vmpooler' (even for vms checked out with ABS)"
+    raise NoMethodError, "Can't snapshot with ABS, use '--service vmpooler' (even for vms checked out with ABS)"
   end
 
   def self.status(verbose, url)
@@ -289,20 +347,24 @@ class ABS
   end
 
   def self.summary(verbose, url)
-    conn = Http.get_conn(verbose, url)
-
-    res = conn.get 'summary'
-    JSON.parse(res.body)
+    raise NoMethodError, 'summary is not defined for ABS'
   end
 
-  def self.query(verbose, url, hostname)
-    return @active_hostnames if @active_hostnames
+  def self.query(verbose, url, job_id)
+    # return saved hostnames from the last time list_active was run
+    # preventing having to query the API again.
+    # This works as long as query is called after list_active
+    return @active_hostnames if @active_hostnames && !@active_hostnames.empty?
 
-    FloatyLogger.info "For vmpooler/snapshot information, use '--service vmpooler' (even for vms checked out with ABS)"
+    # If using the cli query job_id
     conn = Http.get_conn(verbose, url)
-
-    res = conn.get "host/#{hostname}"
-    JSON.parse(res.body)
+    queue_info_res = conn.get "status/queue/info/#{job_id}"
+    if valid_json?(queue_info_res.body)
+      queue_info = JSON.parse(queue_info_res.body)
+    else
+      FloatyLogger.warn "Could not parse the status/queue/info/#{job_id}"
+    end
+    queue_info
   end
 
   def self.modify(_verbose, _url, _hostname, _token, _modify_hash)
@@ -333,4 +395,11 @@ class ABS
       raise "HTTP #{status_code}: #{request_name} request to ABS failed!\n#{body}"
     end
   end
+
+  def self.valid_json?(json)
+    JSON.parse(json)
+    return true
+  rescue TypeError, JSON::ParserError => e
+    return false
+  end
 end