nagios-promoo 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1787169d8cb255b046e890de4ff5916b6d43a548
-  data.tar.gz: 402a454be9941e1133c7ee3c65bbb973ab27623e
+  metadata.gz: 1e735c8510920fe9ed8dd4d200c31aca66a7771f
+  data.tar.gz: c7ca40aa71dbf5291d3b975860518758bce65bee
 SHA512:
-  metadata.gz: 4fb8f36c9fa1f65a67c4360f2f50d6bf5efc956368ac55cc96d9802b7efa9496524236bbc496df393aab30ad1fa795a7291aca3cff15e1be172d456d7274b265
-  data.tar.gz: 5ed803935e772f15a3ea1e4da16d96c3d960ac286dd0b5c05e706b60f0e7437f7fda00fc6341bd8d43c56e1810a8010690930dd90206c90e8f8267f936634204
+  metadata.gz: 2e1ca3d2b6a99c7a34d19b06e2feecdc49e24aecb63c6a57ce526c5ab1858a0ffcb9ec4f9272b80162c801f2002170d1faea6f3bae6cb0b4d445c1b51cc17acd
+  data.tar.gz: 9c15ac5874413491dcd88b478f71f681e71c796550bda663666b3ea38b0e4bd8c559f85513e8b0dbf867e7a00ffe96f4102792085b64d6c347839e56296ad71b

data/lib/nagios/promoo/appdb/master.rb

@@ -28,7 +28,7 @@ class Nagios::Promoo::Appdb::Master < ::Thor
     end
     class_eval %Q^
 def #{probe.declaration}(*args)
-  #{probe}.new.run(options, args)
+  #{probe}.new(options).run(args)
 end
 ^
   end

data/lib/nagios/promoo/appdb/probes/appliances_probe.rb

@@ -18,23 +18,26 @@ class Nagios::Promoo::Appdb::Probes::AppliancesProbe < Nagios::Promoo::Appdb::Pr
     def runnable?; true; end
   end
 
-  def run(options, args = [])
-    count = nil
-    begin
-      count = Timeout::timeout(options[:timeout]) { check_appliances(options) }
-      fail "No appliances found in AppDB" if count < 1
-    rescue => ex
-      puts "APPLIANCES CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
+  def run(args = [])
+    @_count = 0
+
+    Timeout::timeout(options[:timeout]) { check_appliances }
+
+    if @_count < 1
+      puts "APPLIANCES CRITICAL - No appliances found in AppDB" 
       exit 2
     end
 
-    puts "APPLIANCES OK - Found #{count} appliances in AppDB"
+    puts "APPLIANCES OK - Found #{@_count} appliances in AppDB"
+  rescue => ex
+    puts "APPLIANCES UNKNOWN - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 3
   end
 
   private
 
-  def check_appliances(options)
-    [appdb_provider(options)['provider:image']].flatten.compact.count
+  def check_appliances
+    @_count = [appdb_provider['provider:image']].flatten.compact.count
   end
 end

data/lib/nagios/promoo/appdb/probes/base_probe.rb

@@ -6,18 +6,37 @@ class Nagios::Promoo::Appdb::Probes::BaseProbe
   APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'
   APPDB_REQUEST_FORM = 'version=1.0&resource=broker&data=%3Cappdb%3Abroker%20xmlns%3Axs%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema%22%20xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema-instance%22%20xmlns%3Aappdb%3D%22http%3A%2F%2Fappdb.egi.eu%2Fapi%2F1.0%2Fappdb%22%3E%3Cappdb%3Arequest%20id%3D%22vaproviders%22%20method%3D%22GET%22%20resource%3D%22va_providers%22%3E%3Cappdb%3Aparam%20name%3D%22listmode%22%3Edetails%3C%2Fappdb%3Aparam%3E%3C%2Fappdb%3Arequest%3E%3C%2Fappdb%3Abroker%3E'
 
-  def appdb_provider(options)
-    return @provider if @provider
+  attr_reader :options
+
+  def initialize(options)
+    @options = options
+  end
+
+  def appdb_provider
+    return @_provider if @_provider
 
     response = HTTParty.post(APPDB_PROXY_URL, { :body => APPDB_REQUEST_FORM })
     fail "Could not get site"\
-         "details from AppDB [#{response.code}]" unless response.success?
+         "details from AppDB [HTTP #{response.code}]" unless response.success?
+    fail "Response from AppDB has unexpected structure" unless valid_response?(response.parsed_response)
+
+    providers = response.parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
+    providers.delete_if { |prov| prov['provider:endpoint_url'].blank? }
+
+    @_provider = providers.select do |prov|
+                   prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/')
+                 end.first
+    fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @_provider
+
+    @_provider
+  end
 
-    @provider = response.parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider'].select do |prov|
-      prov['provider:endpoint_url'] && (prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
-    end.first
-    fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @provider
+  private
 
-    @provider
+  def valid_response?(response)
+    response['appdb:broker'] \
+    && response['appdb:broker']['appdb:reply'] \
+    && response['appdb:broker']['appdb:reply']['appdb:appdb'] \
+    && response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
   end
 end

data/lib/nagios/promoo/appdb/probes/sizes_probe.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'base_probe')
 class Nagios::Promoo::Appdb::Probes::SizesProbe < Nagios::Promoo::Appdb::Probes::BaseProbe
   class << self
     def description
-      ['sizes', 'Run a probe checking size templates in AppDB']
+      ['sizes', 'Run a probe checking size/flavor/resource templates in AppDB']
     end
 
     def options
@@ -18,23 +18,26 @@ class Nagios::Promoo::Appdb::Probes::SizesProbe < Nagios::Promoo::Appdb::Probes:
     def runnable?; true; end
   end
 
-  def run(options, args = [])
-    count = nil
-    begin
-      count = Timeout::timeout(options[:timeout]) { check_sizes(options) }
-      fail "No size templates found in AppDB" if count < 1
-    rescue => ex
-      puts "SIZES CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
+  def run(args = [])
+    @_count = 0
+
+    Timeout::timeout(options[:timeout]) { check_sizes }
+
+    if @_count < 1
+      puts "SIZES CRITICAL - No size/flavor/resource templates found in AppDB"
       exit 2
     end
 
-    puts "SIZES OK - Found #{count} size templates in AppDB"
+    puts "SIZES OK - Found #{@_count} size/flavor/resource templates in AppDB"
+  rescue => ex
+    puts "SIZES UNKNOWN - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 3
   end
 
   private
 
-  def check_sizes(options)
-    [appdb_provider(options)['provider:template']].flatten.compact.count
+  def check_sizes
+    @_count = [appdb_provider['provider:template']].flatten.compact.count
   end
 end

data/lib/nagios/promoo/appdb/probes/vmcatcher_probe.rb

@@ -26,91 +26,79 @@ class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Pro
   IMAGE_LIST_TEMPLATE = "https://$$TOKEN$$:x-oauth-basic@vmcaster.appdb.egi.eu/store/vo/$$VO$$/image.list"
   IMAGE_LIST_BOUNDARY_REGEXP = /boundary="(?<prefix>-+)(?<id>[[:alnum:]]+)"/
 
-  def run(options, args = [])
-    results = begin
-                Timeout::timeout(options[:timeout]) { check_vmc_sync(options) }
-              rescue => ex
-                puts "VMCATCHER CRITICAL - #{ex.message}"
-                puts ex.backtrace if options[:debug]
-                exit 2
-              end
-
-    if results[:missing].count >= options[:missing_critical]
-      puts "VMCATCHER CRITICAL - #{results[:missing].count} appliance(s) in #{options[:vo].inspect} missing"
+  def run(args = [])
+    @_results = { found: [], outdated: [], missing: [], expected: [] }
+
+    Timeout::timeout(options[:timeout]) { check_vmc_sync }
+
+    if @_results[:missing].count >= options[:missing_critical]
+      puts "VMCATCHER CRITICAL - #{@_results[:missing].count} appliance(s) in #{options[:vo].inspect} missing"
+      exit 2
+    end
+
+    if @_results[:outdated].count >= options[:outdated_critical]
+      puts "VMCATCHER CRITICAL - #{@_results[:outdated].count} appliance(s) in #{options[:vo].inspect} outdated"
       exit 2
     end
 
-    ## TODO: checking for outdated appliances is not working yet
-    ##
-    # if results[:outdated].count >= options[:outdated_critical]
-    #   puts "VMCATCHER CRITICAL - #{results[:outdated].count} appliance(s) in #{options[:vo].inspect} outdated"
-    #   exit 2
-    # end
-    #
-    # if results[:outdated].count > 0
-    #   puts "VMCATCHER WARNING - #{results[:outdated].count} appliances in #{options[:vo].inspect} outdated"
-    #   exit 1
-    # end
-
-    puts "VMCATCHER OK - All appliances registered in #{options[:vo].inspect} are available [#{results[:expected].count}]"
+    if @_results[:outdated].count > 0
+      puts "VMCATCHER WARNING - #{@_results[:outdated].count} appliances in #{options[:vo].inspect} outdated"
+      exit 1
+    end
+
+    puts "VMCATCHER OK - All appliances registered in #{options[:vo].inspect} are available [#{@_results[:expected].count}]"
+  rescue => ex
+    puts "VMCATCHER UNKNOWN - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 3
   end
 
   private
 
-  def check_vmc_sync(options)
-    results = { found: [], outdated: [], missing: [], expected: [] }
-
-    vo_list(options).each do |mpuri|
-      mpuri_versionless = versionless_mpuri(mpuri)
-      mpuri_normalized = normalize_mpuri(mpuri)
-      results[:expected] << mpuri_versionless
-
-      if normalized_appliances(options).include?(mpuri_normalized)
-        results[:found] << mpuri_normalized
-      elsif versionless_appliances(options).include?(mpuri_versionless)
-        results[:found] << mpuri_versionless
-        results[:outdated] << mpuri_versionless
-      else
-        results[:missing] << mpuri_versionless
+  def check_vmc_sync
+    vo_list.each do |hv_image|
+      mpuri_versionless = versionless_mpuri(hv_image['ad:mpuri'])
+      @_results[:expected] << mpuri_versionless
+
+      matching = provider_appliances.select { |appl| appl['mp_uri'] == mpuri_versionless }.first
+
+      unless matching
+        @_results[:missing] << mpuri_versionless
+        next
       end
-    end
 
-    results
+      @_results[:outdated] << mpuri_versionless if hv_image['hv:version'] != matching['vmiversion']
+      @_results[:found] << mpuri_versionless
+    end
   end
 
-  def provider_appliances(options)
-    images = [appdb_provider(options)['provider:image']].flatten.compact
-    images.collect { |image| image['mp_uri'] }.reject { |mpuri| mpuri.blank? }
-  end
+  def provider_appliances
+    return @_appliances if @_appliances
 
-  def normalized_appliances(options)
-    provider_appliances(options).collect { |mpuri| normalize_mpuri(mpuri) }
-  end
+    @_appliances = [appdb_provider['provider:image']].flatten.compact
+    @_appliances.keep_if { |appliance| appliance['voname'] == options[:vo] }
+    @_appliances.reject { |appliance| appliance['mp_uri'].blank? }
 
-  def versionless_appliances(options)
-    provider_appliances(options).collect { |mpuri| versionless_mpuri(mpuri) }
+    @_appliances.each do |appliance|
+      appliance['mp_uri'] = versionless_mpuri(appliance['mp_uri'])
+    end
+
+    @_appliances
   end
 
-  def vo_list(options)
-    return @mpuris if @mpuris
-
-    list = nil
-    begin
-      list_url = IMAGE_LIST_TEMPLATE.gsub('$$TOKEN$$', options[:token]).gsub('$$VO$$', options[:vo])
-      response = HTTParty.get(list_url)
-      fail "Could not get a VO-wide image list" \
-           "from #{list_url.inspect} [#{response.code}]" unless response.success?
-
-      list = JSON.parse(OpenSSL::PKCS7.read_smime(response.parsed_response).data) # TODO: validate the signature?
-      fail "AppDB image list #{list_url.inspect} does " \
-           "not contain images" unless list && list['hv:imagelist'] && list['hv:imagelist']['hv:images']
-    rescue => ex
-      puts "VMCATCHER UNKNOWN - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 3
-    end
+  def vo_list
+    return @_hv_images if @_hv_images
+
+    list_url = IMAGE_LIST_TEMPLATE.gsub('$$TOKEN$$', options[:token]).gsub('$$VO$$', options[:vo])
+    response = HTTParty.get list_url
+    fail "Could not get a VO-wide image list" \
+         "from #{list_url.inspect} [#{response.code}]" unless response.success?
+
+    list = JSON.parse OpenSSL::PKCS7.read_smime(response.parsed_response).data
+    fail "AppDB image list #{list_url.inspect} does " \
+         "not contain images" unless list && list['hv:imagelist'] && list['hv:imagelist']['hv:images']
 
-    @mpuris = list['hv:imagelist']['hv:images'].collect { |im| im['hv:image']['ad:mpuri'] }.reject { |uri| uri.blank? }
+    @_hv_images = list['hv:imagelist']['hv:images'].collect { |im| im['hv:image'] }.reject { |im| im.blank? || im['ad:mpuri'].blank? }
   end
 
   def normalize_mpuri(mpuri)

data/lib/nagios/promoo/appdb/version.rb

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Appdb
-      VERSION = "0.0.1"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/nagios/promoo/occi/master.rb

@@ -33,7 +33,7 @@ class Nagios::Promoo::Occi::Master < ::Thor
     end
     class_eval %Q^
 def #{probe.declaration}(*args)
-  #{probe}.new.run(options, args)
+  #{probe}.new(options).run(args)
 end
 ^
   end

data/lib/nagios/promoo/occi/probes/base_probe.rb

@@ -3,8 +3,14 @@ class Nagios::Promoo::Occi::Probes::BaseProbe
     def runnable?; false; end
   end
 
-  def client(options)
-    @client ||= Occi::Api::Client::ClientHttp.new({
+  attr_reader :options
+
+  def initialize(options)
+    @options = options
+  end
+
+  def client
+    @_client ||= Occi::Api::Client::ClientHttp.new({
       :endpoint => options[:endpoint],
       :auth => {
         :type               => options[:auth].gsub('-voms', ''),

data/lib/nagios/promoo/occi/probes/categories_probe.rb

@@ -23,34 +23,32 @@ class Nagios::Promoo::Occi::Probes::CategoriesProbe < Nagios::Promoo::Occi::Prob
     def runnable?; true; end
   end
 
-  def run(options, args = [])
+  def run(args = [])
     categories = all_categories
     categories -= options[:optional] if options[:optional]
 
-    begin
-      Timeout::timeout(options[:timeout]) do
-        categories.each do |cat|
-          fail "#{cat.inspect} is missing" unless client(options).model.get_by_id(cat, true)
-          next unless options[:check_location] && Nagios::Promoo::Occi::Probes::KindsProbe::INFRA_KINDS.include?(cat)
-
-          # Make sure declared locations are actually available as REST
-          # endpoints. Failure will raise an exception, no need to do
-          # anything here. To keep requirements reasonable, only INFRA
-          # kinds are considered relevant for this part of the check.
-          begin
-            client(options).list(cat)
-          rescue => err
-            fail "Failed to verify declared REST location for #{cat.inspect} (#{err.message})"
-          end
+    Timeout::timeout(options[:timeout]) do
+      categories.each do |cat|
+        fail "#{cat.inspect} is missing" unless client.model.get_by_id(cat, true)
+        next unless options[:check_location] && Nagios::Promoo::Occi::Probes::KindsProbe::INFRA_KINDS.include?(cat)
+
+        # Make sure declared locations are actually available as REST
+        # endpoints. Failure will raise an exception, no need to do
+        # anything here. To keep requirements reasonable, only INFRA
+        # kinds are considered relevant for this part of the check.
+        begin
+          client.list(cat)
+        rescue => err
+          fail "Failed to verify declared REST location for #{cat.inspect} (#{err.message})"
         end
       end
-    rescue => ex
-      puts "CATEGORIES CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
     end
 
     puts 'CATEGORIES OK - All specified OCCI categories were found'
+  rescue => ex
+    puts "CATEGORIES CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
   end
 
   private

data/lib/nagios/promoo/occi/probes/compute_probe.rb

@@ -33,127 +33,120 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
   APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'
   APPDB_REQUEST_FORM = 'version=1.0&resource=broker&data=%3Cappdb%3Abroker%20xmlns%3Axs%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema%22%20xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema-instance%22%20xmlns%3Aappdb%3D%22http%3A%2F%2Fappdb.egi.eu%2Fapi%2F1.0%2Fappdb%22%3E%3Cappdb%3Arequest%20id%3D%22vaproviders%22%20method%3D%22GET%22%20resource%3D%22va_providers%22%3E%3Cappdb%3Aparam%20name%3D%22listmode%22%3Edetails%3C%2Fappdb%3Aparam%3E%3C%2Fappdb%3Arequest%3E%3C%2Fappdb%3Abroker%3E'
 
-  def run(options, args = [])
-    links = begin
-              Timeout::timeout(options[:timeout]) { compute_provision(options) }
-            rescue Timeout::Error => ex
-              puts "COMPUTE CRITICAL - Probe execution timed out [#{options[:timeout]}s]"
-              exit 2
-            end
+  def run(args = [])
+    @_links = {}
 
-    puts "COMPUTE OK - Instance(s) #{links[:compute].inspect} created & cleaned up"
+    Timeout::timeout(options[:timeout]) { compute_provision }
+    puts "COMPUTE OK - Instance(s) #{@_links[:compute].inspect} created & cleaned up"
+  rescue Timeout::Error => ex
+    puts "COMPUTE CRITICAL - Probe execution timed out [#{options[:timeout]}s]"
+    exit 2
   end
 
   private
 
-  def compute_provision(options)
-    links = {}
-
-    compute_link = compute_create(options)
-    links[:compute] = compute_link
-    wait4ready(compute_link, options)
+  def compute_provision
+    compute_create
 
     if options[:with_storage]
-      storage_link = storage_create(options)
-      links[:storage] = storage_link
-      wait4ready(storage_link, options)
-
-      slink = link_instances(compute_link, storage_link, options)
-      links[:storagelink] = slink
-      wait4ready(slink, options)
+      storage_create
+      link_instances
     end
-
-    links
   rescue => ex
     puts "COMPUTE CRITICAL - #{ex.message}"
     puts ex.backtrace if options[:debug]
     exit 2
   ensure
-    mandatory_cleanup links, options
+    mandatory_cleanup @_links
   end
 
-  def compute_create(options)
-    client(options).delete('compute') if options[:cleanup]
+  def compute_create
+    client.delete('compute') if options[:cleanup]
 
-    compute = client(options).get_resource('compute')
+    compute = client.get_resource('compute')
     compute.title = compute.hostname = "#{COMPUTE_NAME_PREFIX}-#{Time.now.to_i}"
 
-    os_tpl, resource_tpl = appdb_information(options)
-    compute.mixins << get_mixin(os_tpl, 'os_tpl', options)
-    compute.mixins << get_mixin(resource_tpl, 'resource_tpl', options)
+    os_tpl, resource_tpl = appdb_information
+    compute.mixins << get_mixin(os_tpl, 'os_tpl')
+    compute.mixins << get_mixin(resource_tpl, 'resource_tpl')
 
-    client(options).create compute
+    @_links[:compute] = client.create compute
+    wait4ready @_links[:compute]
   end
 
-  def storage_create(options)
-    client(options).delete('storage') if options[:cleanup]
+  def storage_create
+    client.delete('storage') if options[:cleanup]
 
-    storage = client(options).get_resource('storage')
+    storage = client.get_resource('storage')
     storage.title = "#{COMPUTE_NAME_PREFIX}-block-#{Time.now.to_i}"
     storage.size = DEFAULT_STORAGE_SIZE # GB
 
-    client(options).create storage
+    @_links[:storage] = client.create storage
+    wait4ready @_links[:storage]
   end
 
-  def link_instances(compute_link, storage_link, options)
-    slink = client(options).get_link('storagelink')
-    slink.source = compute_link
-    slink.target = storage_link
+  def link_instances
+    slink = client.get_link('storagelink')
+    slink.source = @_links[:compute]
+    slink.target = @_links[:storage]
 
-    client(options).create slink
+    @_links[:storagelink] = client.create slink
+    wait4ready @_links[:storagelink]
   end
 
-  def mandatory_cleanup(links, options)
-    mandatory_cleanup_part links[:storagelink], true, options
-    mandatory_cleanup_part links[:storage], false, options
-    mandatory_cleanup_part links[:compute], false, options
+  def mandatory_cleanup(links)
+    mandatory_cleanup_part links[:storagelink], true
+    mandatory_cleanup_part links[:storage], false
+    mandatory_cleanup_part links[:compute], false
   end
 
-  def mandatory_cleanup_part(link, wait4inactive, options)
-    client(options).delete link
-    wait4inactive(link, options) if wait4inactive
+  def mandatory_cleanup_part(link, wait4inactive)
+    client.delete link
+    wait4inactive(link) if wait4inactive
   rescue => ex
     # ignore
   end
 
-  def get_mixin(term, type, options)
-    mxn = client(options).get_mixin(term, type, true)
+  def get_mixin(term, type)
+    mxn = client.get_mixin(term, type, true)
     fail "Mixin #{term.inspect} of type #{type.inspect} not found at the site" unless mxn
     mxn
   end
 
-  def wait4ready(link, options)
+  def wait4ready(link)
     state = nil
 
     while !READY_STATES.include?(state) do
-      state = client(options).describe(link).first.state
+      state = client.describe(link).first.state
       fail "Provisioning failure on #{link.inspect}" if ERROR_STATES.include?(state)
       sleep 5
     end
   end
 
-  def wait4inactive(link, options)
+  def wait4inactive(link)
     state = nil
 
     while !NONREADY_STATES.include?(state) do
-      state = client(options).describe(link).first.state
+      state = client.describe(link).first.state
       fail "De-provisioning failure on #{link.inspect}" if ERROR_STATES.include?(state)
       sleep 5
     end
   end
 
-  def appdb_information(options)
-    [appdb_appliance(options), appdb_smallest_size(options)]
+  def appdb_information
+    [appdb_appliance, appdb_smallest_size]
   rescue => ex
     puts "COMPUTE UNKNOWN - #{ex.message}"
     puts ex.backtrace if options[:debug]
     exit 3
   end
 
-  def appdb_appliance(options)
-    appliance = nil
-    appliance = [appdb_provider(options)['provider:image']].flatten.compact.select do |image|
-      image['mp_uri'] && (normalize_mpuri(image['mp_uri']) == normalize_mpuri(options[:mpuri]))
+  def appdb_appliance
+    appliances = [appdb_provider['provider:image']].flatten.compact
+    appliances.delete_if { |appl| appl['mp_uri'].blank? }
+
+    appliance = appliances.select do |appl|
+      normalize_mpuri(appl['mp_uri']) == normalize_mpuri(options[:mpuri])
     end.first
     fail "Site does not have an appliance with MPURI "\
          "#{normalize_mpuri(options[:mpuri]).inspect} published in AppDB" if appliance.blank?
@@ -161,41 +154,55 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     appliance['va_provider_image_id'].split('#').last
   end
 
-  def appdb_smallest_size(options)
+  def appdb_smallest_size
     sizes = []
-    [appdb_provider(options)['provider:template']].flatten.compact.each do |template|
+    templates = [appdb_provider['provider:template']].flatten.compact
+
+    templates.each do |template|
       sizes << [
         template['provider_template:resource_name'].split('#').last,
         template['provider_template:main_memory_size'].to_i + (template['provider_template:physical_cpus'].to_i * CPU_SUM_WEIGHT)
       ]
     end
     fail "No appliance sizes available in AppDB" if sizes.blank?
-    sizes.sort! { |x,y| x.last <=> y.last }
 
+    sizes.sort! { |x,y| x.last <=> y.last }
     sizes.first.first
   end
 
-  def appdb_provider(options)
-    return @provider if @provider
+  def appdb_provider
+    return @_provider if @_provider
 
     parsed_response = cache_fetch('appdb-sites', options[:cache_expiration]) do
                         response = HTTParty.post(APPDB_PROXY_URL, { :body => APPDB_REQUEST_FORM })
                         fail "Could not get appliance "\
                              "details from AppDB [#{response.code}]" unless response.success?
+                        fail "Response from AppDB has unexpected structure" unless valid_response?(response.parsed_response)
+
                         response.parsed_response
                       end
 
-    @provider = parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider'].select do |prov|
-      prov['provider:endpoint_url'] && (prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
+    providers = parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
+    providers.delete_if { |prov| prov['provider:endpoint_url'].blank? }
+
+    @_provider = providers.select do |prov|
+      prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/')
     end.first
-    fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @provider
+    fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @_provider
 
-    @provider
+    @_provider
   end
 
   def normalize_mpuri(mpuri)
     mpuri.gsub(/\/+$/, '').gsub(/:\d+$/, '')
   end
 
+  def valid_response?(response)
+    response['appdb:broker'] \
+    && response['appdb:broker']['appdb:reply'] \
+    && response['appdb:broker']['appdb:reply']['appdb:appdb'] \
+    && response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
+  end
+
   include Nagios::Promoo::Utils::Cache
 end