foreman_wreckingball 3.0.1 → 3.1.0

data/app/services/foreman_wreckingball/vmware_cluster_importer.rb

@@ -2,7 +2,6 @@
 
 module ForemanWreckingball
   class VmwareClusterImporter
-    delegate :logger, :to => :Rails
     attr_accessor :compute_resource, :counters
 
     def initialize(options = {})
@@ -39,5 +38,11 @@ module ForemanWreckingball
     def cluster_names
       @cluster_names ||= compute_resource.clusters
     end
+
+    private
+
+    def logger
+      ::Foreman::Logging.logger('foreman_wreckingball/import')
+    end
   end
 end

data/app/services/foreman_wreckingball/vmware_hypervisor_importer.rb

@@ -2,7 +2,6 @@
 
 module ForemanWreckingball
   class VmwareHypervisorImporter
-    delegate :logger, :to => :Rails
     attr_accessor :compute_resource, :counters
 
     def initialize(options = {})
@@ -16,6 +15,7 @@ module ForemanWreckingball
       compute_resource.refresh_cache
       compute_resource.vmware_clusters.each do |cluster|
         import_hypervisors(cluster)
+        delete_removed_hypervisors(cluster)
       end
       logger.info("Import hypervisors for '#{compute_resource}' completed. Added: #{counters[:added] || 0}, Updated: #{counters[:updated] || 0}, Deleted: #{counters[:deleted] || 0} hypervisors") # rubocop:disable Metrics/LineLength
     end
@@ -101,6 +101,17 @@ module ForemanWreckingball
       host
     end
 
+    def delete_removed_hypervisors(cluster)
+      hypervisor_names = hypervisors(cluster).map(&:name)
+      hypervisor_uuids = hypervisors(cluster).map(&:uuid)
+      delete_query = ::ForemanWreckingball::VmwareHypervisorFacet.joins(:host).where(vmware_cluster: cluster).where.not('hosts.name': hypervisor_names).where.not(uuid: hypervisor_uuids)
+      counters[:deleted] = if ActiveRecord::Base.connection.adapter_name.downcase.starts_with?('mysql')
+                             ::ForemanWreckingball::VmwareHypervisorFacet.where(:id => delete_query.pluck(:id)).delete_all
+                           else
+                             delete_query.delete_all
+                           end
+    end
+
     def organization
       return unless SETTINGS[:organizations_enabled]
       compute_resource.organizations.first
@@ -122,5 +133,9 @@ module ForemanWreckingball
       counters[id] ||= 0
       counters[id] += 1
     end
+
+    def logger
+      ::Foreman::Logging.logger('foreman_wreckingball/import')
+    end
   end
 end

data/app/views/foreman_wreckingball/hosts/_hosts.json.rabl

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+collection @hosts
+
+attributes :name
+
+child owner: :owner do
+  attribute :name
+end
+
+child :environment do
+  attribute :name
+end
+
+node(:path) { |host| host_path(host) }
+
+node(:status) do |host|
+  status = host.public_send(locals[:host_association])
+  {
+    label: status.to_label,
+    icon_class: host_global_status_icon_class(status.to_global),
+    status_class: host_global_status_class(status.to_global)
+  }
+end
+
+node(:remediate, if: lambda do |host|
+  locals[:supports_remediate] && begin
+    options = hash_for_schedule_remediate_host_path(id: host,
+                                                    status_id: host.public_send(locals[:host_association]).id)
+                                                                   .merge(auth_object: host,
+                                                                          permission: :remediate_vmware_status_hosts)
+    authorized_for(options)
+  end
+end) do |host|
+  status_id = host.public_send(locals[:host_association]).id
+  {
+    label: _('Remediate'),
+    title: _('Remediate Host OS'),
+    path: schedule_remediate_host_path(host, status_id: status_id)
+  }
+end

data/app/views/foreman_wreckingball/hosts/_status_dashboard_content.erb

@@ -11,9 +11,8 @@
   render :partial => 'status_row', locals: {
     name: status[:name],
     description: status[:description],
-    counter: vmware_status_counter(status[:hosts], status[:host_association]),
+    counter: status[:counter],
     status: status[:host_association],
-    hosts: status[:hosts],
     supports_remediate: status[:supports_remediate],
     id: idx
   }

data/app/views/foreman_wreckingball/hosts/_status_row.html.erb

@@ -1,4 +1,4 @@
-<div class="list-group-item list-view-pf-stacked list-view-pf-top-align">
+<div class="status-row list-group-item list-view-pf-stacked list-view-pf-top-align">
   <div class="list-group-item-header">
     <div class="list-view-pf-expand">
       <span class="fa fa-angle-right"></span>
@@ -53,50 +53,15 @@
       <span class="pficon pficon-close"></span>
     </div>
     <div class="row">
-      <div class="col-md-12">
+      <div class="col-md-12 status-hosts-container">
         <% if counter[:warning] > 0 || counter[:critical] > 0 %>
           <p><%= _('The following host require manual attention:') %></p>
-          <table class="table table-striped table-fixed">
-            <thead>
-              <tr>
-                <th><%= _('Hostname') %></th>
-                <th><%= _('Status') %></th>
-                <th><%= _('Owner') %></th>
-                <th><%= _('Puppet Environment') %></th>
-                <% if supports_remediate %>
-                  <th><%= _('Actions') %></th>
-                <% end %>
-              </tr>
-            </thead>
-            <tbody>
-              <% hosts.each do |host| %>
-                <% next if host.public_send(status).to_global == HostStatus::Global::OK %>
-                <tr>
-                  <td class="ellipsis"><%= link_to_if_authorized(host.name, hash_for_host_path(:id => host)) %></td>
-                  <td>
-                    <span class="<%= host_global_status_icon_class(host.public_send(status).to_global) %>"></span>
-                    <span class="<%= host_global_status_class(host.public_send(status).to_global) %>"><%= _(host.public_send(status).to_label) %></span>
-                  </td>
-                  <td class="ellipsis"><%= host.owner %></td>
-                  <td class="ellipsis"><%= host.environment %></td>
-                  <% if supports_remediate %>
-                    <td>
-                      <%=
-                        action_buttons(
-                          display_link_if_authorized(
-                            _('Remediate'),
-                            hash_for_schedule_remediate_host_path(:id => host, :status_id => host.public_send(status).id).merge(:auth_object => host, :permission => 'remediate_vmware_status_hosts'),
-                            :data => { :title => _('Remediate Host OS'), :submit_class => 'btn-danger' },
-                            :onclick => 'show_modal(this); return false;'
-                          )
-                        )
-                      %>
-                  </td>
-                <% end %>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
+          <%=
+            render :partial => 'status_row_hosts_table', locals: {
+              status: status,
+              supports_remediate: supports_remediate
+            }
+          %>
         <% else %>
           <p><%= _('No manual actions required.') %></p>
         <% end %>

data/app/views/foreman_wreckingball/hosts/_status_row_hosts_table.html.erb

@@ -0,0 +1,17 @@
+<%= content_tag :table, id: status,
+                        class: 'table table-striped table-fixed status-hosts',
+                        'data-hosts-url': ajax_status_dashboard_hosts_path(status) do %>
+  <%= content_tag :thead do %>
+    <%= content_tag :tr do %>
+      <%= content_tag :th, _('Hostname') %>
+      <%= content_tag :th, _('Status') %>
+      <%= content_tag :th, _('Owner') %>
+      <%= content_tag :th, _('Puppet Environment') %>
+      <%= content_tag :th, _('Actions') %>
+    <% end %>
+  <% end %>
+  <%= content_tag(:tbody) {} %>
+<% end %>
+
+<%= alert header: _("Oops, we're sorry but something went wrong"), text: '',
+          class: 'alert-danger', close: false %>

data/app/views/foreman_wreckingball/hosts/status_dashboard.html.erb

@@ -1,5 +1,7 @@
 <% title _('VMware Status Overview') %>
 <% javascript 'foreman_wreckingball/modal' %>
+<% javascript 'foreman_wreckingball/status_hosts_table' %>
+<% stylesheet 'foreman_wreckingball/status_hosts_table' %>
 <% javascript 'foreman_tasks/trigger_form' %>
 <% stylesheet 'foreman_tasks/trigger_form' %>
 

data/app/views/foreman_wreckingball/hosts/status_hosts.json.rabl

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+object false
+
+node(:recordsTotal) { @count }
+node(:recordsFiltered) { @count }
+node(:data) do
+  partial 'foreman_wreckingball/hosts/_hosts', object: @hosts,
+                                               locals: {
+                                                 host_association: @status.host_association,
+                                                 supports_remediate: @status.supports_remediate?
+                                               }
+end

data/config/routes.rb

@@ -10,6 +10,7 @@ Rails.application.routes.draw do
         end
         collection do
           get :status_dashboard
+          get 'status_dashboard/hosts(/:status)', as: :ajax_status_dashboard, action: :status_hosts, defaults: { format: :json }
           put :refresh_status_dashboard
         end
       end

data/db/migrate/20181020174609_add_power_state_to_vmware_facets.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPowerStateToVmwareFacets < ActiveRecord::Migration[5.1]
+  def change
+    add_column :vmware_facets, :power_state, :integer, default: 1, index: true
+  end
+end

data/db/migrate/20181021111543_add_indexes_to_vmware_hypervisor_facets.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddIndexesToVmwareHypervisorFacets < ActiveRecord::Migration[5.1]
+  def change
+    add_index :vmware_hypervisor_facets, :uuid
+    add_index :vmware_hypervisor_facets, [:vmware_cluster_id, :uuid]
+  end
+end

data/lib/foreman_wreckingball/engine.rb

@@ -23,6 +23,15 @@ module ForemanWreckingball
       end
     end
 
+    initializer 'foreman_wreckingball.load_default_settings', before: :load_config_initializers do
+      table_exists = begin
+                       Setting.table_exists?
+                     rescue StandardError
+                       false
+                     end
+      require_dependency File.expand_path('../../app/models/setting/wreckingball.rb', __dir__) if table_exists
+    end
+
     initializer 'foreman_wreckingball.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_wreckingball do
         requires_foreman '>= 1.18'
@@ -49,6 +58,8 @@ module ForemanWreckingball
         register_custom_status(ForemanWreckingball::ToolsStatus)
         register_custom_status(ForemanWreckingball::OperatingsystemStatus)
         register_custom_status(ForemanWreckingball::CpuHotAddStatus)
+        register_custom_status(ForemanWreckingball::SpectreV2Status)
+        register_custom_status(ForemanWreckingball::HardwareVersionStatus)
 
         register_facet(ForemanWreckingball::VmwareFacet, :vmware_facet)
 
@@ -63,6 +74,9 @@ module ForemanWreckingball
                               :partial => 'compute_resources/hypervisors_tab',
                               :onlyif => proc { |cr| cr.provider_friendly_name == 'VMware' && cr.vmware_hypervisor_facets.any? }
         end
+
+        # add custom logger
+        logger :import, enabled: true
       end
     end
 
@@ -82,7 +96,9 @@ module ForemanWreckingball
 
         if ForemanWreckingball.fog_patches_required?
           Fog::Compute::Vsphere::Host.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Host)
+          Fog::Compute::Vsphere::Server.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Server)
           Fog::Compute::Vsphere::Real.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Real)
+          Fog::Compute::Vsphere::Mock.send(:include, FogExtensions::ForemanWreckingball::Vsphere::Mock)
         end
       rescue StandardError => e
         Rails.logger.warn "ForemanWreckingball: skipping engine hook (#{e})\n#{e.backtrace.join("\n")}"
@@ -103,7 +119,7 @@ module ForemanWreckingball
     require 'fog/vsphere'
     require 'fog/vsphere/compute'
     require 'fog/vsphere/models/compute/host'
-    !::Fog::Compute::Vsphere::Host.instance_methods.include?(:feature_capabilities)
+    true
   rescue LoadError
     false
   end

data/lib/foreman_wreckingball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWreckingball
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/test/actions/foreman_wreckingball/host/refresh_vmware_facet_test.rb

@@ -18,11 +18,12 @@ module Actions
           ::ForemanWreckingball::SpectreV2Status.any_instance.stubs(:recent_hw_version?).returns(true)
           # this is not stubbed correctly in fog-vsphere
           Fog::Compute::Vsphere::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
+          Setting::Wreckingball.load_defaults
         end
         teardown { ::Fog.unmock! }
 
         let(:compute_resource) do
-          cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
+          cr = FactoryBot.create(:compute_resource, :vmware, :with_taxonomy, :uuid => 'Solutions')
           ComputeResource.find(cr.id)
         end
 

data/test/actions/foreman_wreckingball/host/remediate_hardware_version_test.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module Actions
+  module ForemanWreckingball
+    module Vmware
+      class RemediateHardwareVersionTest < ActiveSupport::TestCase
+        include ::Dynflow::Testing
+        setup do
+          ::Fog.mock!
+          # this is not stubbed correctly in fog-vsphere
+          Fog::Compute::Vsphere::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
+          Fog::Compute::Vsphere::Server.any_instance.stubs(:hardware_version).returns('vmx-13')
+          ::ForemanWreckingball::SpectreV2Status.any_instance.stubs(:recent_hw_version?).returns(true)
+          ::PowerManager::Virt.any_instance.stubs(:ready?).returns(true)
+          Setting::Wreckingball.load_defaults
+        end
+        teardown { ::Fog.unmock! }
+
+        let(:compute_resource) do
+          cr = FactoryBot.create(:compute_resource, :vmware, :with_taxonomy, :uuid => 'Solutions')
+          ComputeResource.find(cr.id)
+        end
+        let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
+        let(:vm) { compute_resource.find_vm_by_uuid(uuid) }
+
+        let(:host) do
+          FactoryBot.create(
+            :host,
+            :managed,
+            :with_vmware_facet,
+            compute_resource: compute_resource,
+            uuid: uuid
+          )
+        end
+
+        let(:action_class) { ::Actions::ForemanWreckingball::Host::RemediateHardwareVersion }
+        let(:action) do
+          create_action(action_class).tap do |action|
+            action.stubs(:action_subject).returns(host)
+            action.input.update(
+              host: {
+                id: host.id
+              }
+            )
+          end
+        end
+        let(:planned_action) do
+          plan_action(action, host)
+        end
+        let(:runned_action) { run_action(planned_action) }
+
+        test "it remediates the host's hardware version" do
+          assert_equal :success, runned_action.state
+          assert_equal true, runned_action.output.fetch('state')
+          assert_equal true, runned_action.output.fetch('initially_powered_on')
+          assert_equal 'vmx-13', host.reload.vmware_facet.hardware_version
+        end
+      end
+    end
+  end
+end

data/test/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem_test.rb

@@ -12,11 +12,13 @@ module Actions
           # this is not stubbed correctly in fog-vsphere
           Fog::Compute::Vsphere::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
           ::ForemanWreckingball::SpectreV2Status.any_instance.stubs(:recent_hw_version?).returns(true)
+          ::PowerManager::Virt.any_instance.stubs(:ready?).returns(true)
+          Setting::Wreckingball.load_defaults
         end
         teardown { ::Fog.unmock! }
 
         let(:compute_resource) do
-          cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
+          cr = FactoryBot.create(:compute_resource, :vmware, :with_taxonomy, :uuid => 'Solutions')
           ComputeResource.find(cr.id)
         end
         let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }

data/test/controllers/foreman_wreckingball/hosts_controller_test.rb

@@ -11,6 +11,10 @@ module ForemanWreckingball
       )
     end
 
+    setup do
+      Setting::Wreckingball.load_defaults
+    end
+
     describe '#status_dashboard' do
       test 'shows an empty status page' do
         get :status_dashboard, session: set_session_user
@@ -24,6 +28,21 @@ module ForemanWreckingball
       end
     end
 
+    describe '#status_hosts' do
+      test 'returns hosts for status' do
+        ok_status = FactoryBot.create(:vmware_hardware_version_status, :with_ok_status)
+        out_of_date_status = FactoryBot.create(:vmware_hardware_version_status, :with_out_of_date_status)
+
+        get :status_hosts, params: { status: ::ForemanWreckingball::HardwareVersionStatus.host_association },
+                           session: set_session_user, xhr: true
+
+        assert_response :ok
+        hosts_names = JSON.parse(response.body)['data'].map { |host| host['name'] }
+        assert_includes hosts_names, out_of_date_status.host.name
+        refute_includes hosts_names, ok_status.host.name
+      end
+    end
+
     describe '#refresh_status_dashboard' do
       test 'redirects to scheduled task' do
         ForemanTasks.expects(:async_task).returns(fake_task)

data/test/factories/compute_resource.rb

@@ -11,5 +11,10 @@ FactoryBot.modify do
         create_list(:vmware_cluster, evaluator.vmware_clusters_count, compute_resource: compute_resource)
       end
     end
+
+    trait :with_taxonomy do
+      organizations { [Organization.find_by(name: 'Organization 1')] }
+      locations { [Location.find_by(name: 'Location 1')] }
+    end
   end
 end