Skip to content

Commit

Permalink
Suspended SmartState part I
Browse files Browse the repository at this point in the history
  • Loading branch information
slemrmartin committed May 25, 2018
1 parent 0d74660 commit 8b42ce2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 19 deletions.
7 changes: 4 additions & 3 deletions app/models/ext_management_system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,15 @@ def hostname_format_valid?
default_value_for :enabled, true

def self.enable(ems_id)
ExtManagementSystem.where('id = ? OR parent_ems_id = ?', ems_id, ems_id).update_all(enabled: true)
where(:id => ems_id).or(where(:parent_ems_id => ems_id)).update_all(enabled: true)
_log.info("Provider #{name} enabled")
end

def self.disable(ems_id)
ExtManagementSystem.where('id = ? OR parent_ems_id = ?', ems_id, ems_id).update_all(enabled: false)
where(:id => ems_id).or(where(:parent_ems_id => ems_id)).update_all(enabled: false)
_log.info("Provider #{name} disabled")
end


def self.with_ipaddress(ipaddress)
joins(:endpoints).where(:endpoints => {:ipaddress => ipaddress})
end
Expand Down
5 changes: 5 additions & 0 deletions app/models/host.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,11 @@ def scan(userid = "system", options = {})
end

def scan_queue(userid = 'system', _options = {})
if ext_management_system.present? && !ext_management_system.enabled
_log.debug("SmartState analysis disabled [#{log_target}] (provider #{ext_management_system.name} disabled)")
return nil
end

_log.info("Queuing scan of #{log_target}")

task = MiqTask.create(:name => "SmartState Analysis for '#{name}' ", :userid => userid)
Expand Down
16 changes: 0 additions & 16 deletions app/models/miq_queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ def self.submit_job(options)
service = options.delete(:service) || "generic"
resource = options.delete(:affinity)

return unless resource_enabled?(resource)

case service
when "automate"
# options[:queue_name] = "generic"
Expand Down Expand Up @@ -209,20 +207,6 @@ def self.submit_job(options)
put(options)
end

# TODO: Array param not seen yet
# @param resource [ExtManagementSystem|Nil|Array<Class,id>] resource for affinity. Typically an ems
def self.resource_enabled?(resource)
if resource.respond_to?(:ext_management_system)
ems = resource.ext_management_system
if ems.present? && !ems.enabled
_log.info("Provider is disabled: #{ems.name}. MiqQueue skipped.")
return false
end
end

true
end

def self.where_queue_name(is_array)
is_array ? "AND queue_name in (?)" : "AND queue_name = ?"
end
Expand Down
4 changes: 4 additions & 0 deletions app/models/vm_or_template/scanning.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ def scan(userid = "system", options = {})
end

def raw_scan(userid = "system", options = {})
if ext_management_system.present? && !ext_management_system.enabled
_log.debug("SmartState analysis disabled [#{name}] (provider #{ext_management_system.name} disabled)")
return nil
end
options = {
:target_id => id,
:target_class => self.class.base_class.name,
Expand Down

0 comments on commit 8b42ce2

Please sign in to comment.