foreman_wreckingball 3.0.1 → 3.1.0

data/test/factories/foreman_wreckingball_factories.rb

@@ -4,6 +4,7 @@ FactoryBot.define do
   factory :vmware_facet, class: 'ForemanWreckingball::VmwareFacet' do
     vmware_cluster
     tools_state 2 #:toolsOk
+    power_state 1 #:poweredOn
     cpus 2
     corespersocket 1
     memory_mb 8192
@@ -149,4 +150,18 @@ FactoryBot.define do
     reported_at { Time.now.utc }
     after(:build) { |status| status.status = status.to_status }
   end
+
+  factory :vmware_hardware_version_status, class: 'ForemanWreckingball::HardwareVersionStatus' do
+    association :host, factory: [:host, :with_vmware_facet]
+    reported_at { Time.now.utc }
+    after(:build) { |status| status.status = status.to_status }
+
+    trait(:with_ok_status) do
+      after(:build) { |status| status.status = ForemanWreckingball::HardwareVersionStatus::OK }
+    end
+
+    trait(:with_out_of_date_status) do
+      after(:build) { |status| status.status = ForemanWreckingball::HardwareVersionStatus::OUTOFDATE }
+    end
+  end
 end

data/test/factories/host.rb

@@ -31,10 +31,18 @@ FactoryBot.modify do
       end
     end
 
+    trait :with_vmware_hardware_version_status do
+      with_vmware_facet
+      after(:create) do |host, _evaluator|
+        create :vmware_hardware_version_status, host: host
+      end
+    end
+
     trait :with_wreckingball_statuses do
       with_vmware_tools_status
       with_vmware_operatingsystem_status
       with_vmware_cpu_hot_add_status
+      with_vmware_hardware_version_status
     end
   end
 end

data/test/models/foreman_wreckingball/hardware_version_status_test.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanWreckingball
+  class HardwareVersionStatusTest < ActiveSupport::TestCase
+    setup do
+      User.current = users(:admin)
+      Setting::Wreckingball.load_defaults
+    end
+
+    should belong_to(:host)
+
+    let(:host) do
+      FactoryBot.create(
+        :host,
+        :managed,
+        :with_vmware_facet
+      )
+    end
+    let(:status) { ForemanWreckingball::HardwareVersionStatus.new(host: host) }
+
+    test 'has a host association' do
+      status.save!
+      assert_equal status, host.public_send(status.class.host_association)
+    end
+
+    test '#relevant is only for hosts with a vmware facet' do
+      h = FactoryBot.build(:host, :managed)
+      refute ForemanWreckingball::ToolsStatus.new(host: h).relevant?
+      assert status.relevant?
+    end
+
+    test '#relevant is for hosts with a hardware version' do
+      assert status.relevant?
+      host.vmware_facet.hardware_version = nil
+      refute status.relevant?
+    end
+
+    describe 'status calculation' do
+      test 'is out of date when version is too old' do
+        status.host.vmware_facet.hardware_version = 'vmx-9'
+        assert_equal HardwareVersionStatus::OUTOFDATE, status.to_status
+      end
+
+      test 'is ok when version is recent enough' do
+        status.host.vmware_facet.hardware_version = 'vmx-13'
+        assert_equal HardwareVersionStatus::OK, status.to_status
+      end
+    end
+
+    describe 'status labels' do
+      test 'when version is out of date' do
+        status.status = HardwareVersionStatus::OUTOFDATE
+        assert_equal 'Out of date', status.to_label
+      end
+
+      test 'when version is recent' do
+        status.status = HardwareVersionStatus::OK
+        assert_equal 'OK', status.to_label
+      end
+    end
+
+    describe 'global status' do
+      test 'is warning when version is out of date' do
+        status.status = HardwareVersionStatus::OUTOFDATE
+        assert_equal HostStatus::Global::WARN, status.to_global
+      end
+
+      test 'is ok when version is recent' do
+        status.status = HardwareVersionStatus::OK
+        assert_equal HostStatus::Global::OK, status.to_global
+      end
+    end
+
+    describe '#recent_hw_version?' do
+      test 'is true when hw version is new' do
+        status.host.vmware_facet.hardware_version = 'vmx-13'
+        assert status.recent_hw_version?
+      end
+
+      test 'is false when hw version is ancient' do
+        status.host.vmware_facet.hardware_version = 'vmx-3'
+        refute status.recent_hw_version?
+      end
+    end
+  end
+end

data/test/models/foreman_wreckingball/tools_status_test.rb

@@ -32,13 +32,16 @@ module ForemanWreckingball
     end
 
     describe 'status calculation' do
+      setup do
+        Host::Managed.any_instance.stubs(:supports_power?).returns(true)
+      end
+
       test 'when host is powered down' do
-        Host::Managed.any_instance.stubs(:supports_power_and_running?).returns(false)
+        host.vmware_facet.update(power_state: 'poweredOff')
         assert_equal ForemanWreckingball::ToolsStatus::POWERDOWN, status.to_status
       end
 
       test 'when host is powered on' do
-        Host::Managed.any_instance.stubs(:supports_power_and_running?).returns(true)
         assert_equal 2, status.to_status
       end
     end

data/test/models/foreman_wreckingball/vmware_facet_test.rb

@@ -8,6 +8,26 @@ module ForemanWreckingball
     should belong_to(:vmware_cluster)
     should have_many(:vmware_hypervisor_facets)
 
+    describe '#vm_ready?' do
+      let(:host) do
+        FactoryBot.create(
+          :host,
+          :managed,
+          :with_vmware_facet
+        )
+      end
+      let(:vmware_facet) { host.vmware_facet }
+
+      test 'is true when vm is powered on' do
+        assert_equal true, vmware_facet.vm_ready?
+      end
+
+      test 'is false when vm is not powered on' do
+        vmware_facet.power_state = 'suspended'
+        assert_equal false, vmware_facet.vm_ready?
+      end
+    end
+
     describe '#refresh!' do
       let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
       let(:vm) do
@@ -25,7 +45,7 @@ module ForemanWreckingball
       end
 
       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
 
@@ -47,7 +67,7 @@ module ForemanWreckingball
         ::Fog::Compute::Vsphere::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
         ::Fog::Compute::Vsphere::Server.any_instance.stubs(:hardware_version).returns('vmx-9')
         ::Fog::Compute::Vsphere::Server.any_instance.stubs(:corespersocket).returns(1)
-        ::Fog::Compute::Vsphere::Server.any_instance.stubs(:ready?).returns(true)
+        ::Fog::Compute::Vsphere::Server.any_instance.stubs(:power_state).returns('poweredOn')
       end
       teardown { ::Fog.unmock! }
 
@@ -58,6 +78,7 @@ module ForemanWreckingball
         assert_equal 2196, vmware_facet.memory_mb
         assert_equal 'rhel6_64Guest', vmware_facet.guest_id
         assert_equal 'toolsOk', vmware_facet.tools_state
+        assert_equal 'poweredOn', vmware_facet.power_state
         assert_equal false, vmware_facet.cpu_hot_add
         assert_equal ['cpuid.SSE3', 'cpuid.AES', 'cpuid.Intel'], vmware_facet.cpu_features
         assert_equal 'vmx-9', vmware_facet.hardware_version

data/test/models/host_test.rb

@@ -10,4 +10,5 @@ class Host::ManagedTest < ActiveSupport::TestCase
   should have_one(:vmware_operatingsystem_status_object)
   should have_one(:vmware_cpu_hot_add_status_object)
   should have_one(:vmware_spectre_v2_status_object)
+  should have_one(:vmware_hardware_version_status_object)
 end

data/test/unit/foreman_wreckingball/vmware_hypervisor_importer_test.rb

@@ -63,6 +63,17 @@ module ForemanWreckingball
         assert_equal '4c4c4544-0051-3610-8046-c4c44f584a32', host.vmware_hypervisor_facet.uuid
       end
 
+      test 'removes hypervisor facets from stale hosts' do
+        host_on_other_cluster = FactoryBot.create(:host, :managed, :with_vmware_hypervisor_facet)
+        stale_facet = FactoryBot.create(:vmware_hypervisor_facet, vmware_cluster: cluster, compute_resource: compute_resource)
+
+        importer.import!
+
+        assert_nil ForemanWreckingball::VmwareHypervisorFacet.find_by(id: stale_facet.id)
+        assert_not_nil Host::Managed.find_by(name: 'host1.example.com').vmware_hypervisor_facet
+        assert_not_nil Host::Managed.find_by(id: host_on_other_cluster.id).vmware_hypervisor_facet
+      end
+
       test 'updates host by katello name' do
         host = FactoryBot.create(:host,  organization: organization)
         host.update!(:name => "virt-who-host1.example.com-#{organization.id}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_wreckingball
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -63,16 +63,21 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/foreman_wreckingball/modal.js
+- app/assets/javascripts/foreman_wreckingball/status_hosts_table.js
+- app/assets/stylesheets/foreman_wreckingball/status_hosts_table.css.scss
 - app/controllers/foreman_wreckingball/hosts_controller.rb
 - app/helpers/concerns/foreman_wreckingball/hosts_helper_extensions.rb
 - app/helpers/foreman_wreckingball/hypervisors_helper.rb
 - app/jobs/update_hosts_vmware_facets.rb
 - app/lib/actions/foreman_wreckingball/host/refresh_vmware_facet.rb
+- app/lib/actions/foreman_wreckingball/host/remediate_hardware_version.rb
 - app/lib/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem.rb
 - app/lib/actions/foreman_wreckingball/vmware/schedule_vmware_sync.rb
 - app/lib/actions/foreman_wreckingball/vmware/sync_compute_resource.rb
 - app/lib/fog_extensions/foreman_wreckingball/vsphere/host.rb
+- app/lib/fog_extensions/foreman_wreckingball/vsphere/mock.rb
 - app/lib/fog_extensions/foreman_wreckingball/vsphere/real.rb
+- app/lib/fog_extensions/foreman_wreckingball/vsphere/server.rb
 - app/lib/vsphere_os_identifiers.rb
 - app/lib/vsphere_os_identifiers/data.yaml
 - app/lib/vsphere_os_identifiers/os.rb
@@ -82,26 +87,32 @@ files:
 - app/models/concerns/foreman_wreckingball/vmware_facet_host_extensions.rb
 - app/models/concerns/foreman_wreckingball/vmware_hypervisor_facet_host_extensions.rb
 - app/models/foreman_wreckingball/cpu_hot_add_status.rb
+- app/models/foreman_wreckingball/hardware_version_status.rb
 - app/models/foreman_wreckingball/operatingsystem_status.rb
 - app/models/foreman_wreckingball/spectre_v2_status.rb
 - app/models/foreman_wreckingball/tools_status.rb
 - app/models/foreman_wreckingball/vmware_cluster.rb
 - app/models/foreman_wreckingball/vmware_facet.rb
 - app/models/foreman_wreckingball/vmware_hypervisor_facet.rb
-- app/services/foreman_wreckingball/debris_collector.rb
+- app/models/setting/wreckingball.rb
 - app/services/foreman_wreckingball/vmware_cluster_importer.rb
 - app/services/foreman_wreckingball/vmware_hypervisor_importer.rb
 - app/views/compute_resources/_hypervisors_tab.html.erb
+- app/views/foreman_wreckingball/hosts/_hosts.json.rabl
 - app/views/foreman_wreckingball/hosts/_status_dashboard_content.erb
 - app/views/foreman_wreckingball/hosts/_status_dashboard_empty.erb
 - app/views/foreman_wreckingball/hosts/_status_row.html.erb
+- app/views/foreman_wreckingball/hosts/_status_row_hosts_table.html.erb
 - app/views/foreman_wreckingball/hosts/schedule_remediate.html.erb
 - app/views/foreman_wreckingball/hosts/status_dashboard.html.erb
+- app/views/foreman_wreckingball/hosts/status_hosts.json.rabl
 - config/routes.rb
 - db/migrate/20171106155000_create_vmware_facets.rb
 - db/migrate/20180504135345_add_cpu_features_to_vmware_facets.rb
 - db/migrate/20180504135515_add_hardware_version_to_vmware_facets.rb
 - db/migrate/20180614105545_add_feature_capabilities_to_vmware_hypervisor_facets.rb
+- db/migrate/20181020174609_add_power_state_to_vmware_facets.rb
+- db/migrate/20181021111543_add_indexes_to_vmware_hypervisor_facets.rb
 - lib/foreman_wreckingball.rb
 - lib/foreman_wreckingball/engine.rb
 - lib/foreman_wreckingball/scheduled_jobs.rb
@@ -112,6 +123,7 @@ files:
 - locale/foreman_wreckingball.pot
 - locale/gemspec.rb
 - test/actions/foreman_wreckingball/host/refresh_vmware_facet_test.rb
+- test/actions/foreman_wreckingball/host/remediate_hardware_version_test.rb
 - test/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem_test.rb
 - test/actions/foreman_wreckingball/vmware/schedule_vmware_sync_test.rb
 - test/actions/foreman_wreckingball/vmware/sync_compute_resource_test.rb
@@ -123,6 +135,7 @@ files:
 - test/models/compute_resource_test.rb
 - test/models/compute_resources/vmware_test.rb
 - test/models/foreman_wreckingball/cpu_hot_add_status_test.rb
+- test/models/foreman_wreckingball/hardware_version_status_test.rb
 - test/models/foreman_wreckingball/operatingsystem_status_test.rb
 - test/models/foreman_wreckingball/spectre_v2_status_test.rb
 - test/models/foreman_wreckingball/tools_status_test.rb
@@ -165,6 +178,7 @@ test_files:
 - test/models/foreman_wreckingball/operatingsystem_status_test.rb
 - test/models/foreman_wreckingball/spectre_v2_status_test.rb
 - test/models/foreman_wreckingball/vmware_hypervisor_facet_test.rb
+- test/models/foreman_wreckingball/hardware_version_status_test.rb
 - test/models/foreman_wreckingball/cpu_hot_add_status_test.rb
 - test/models/foreman_wreckingball/vmware_cluster_test.rb
 - test/models/foreman_wreckingball/vmware_facet_test.rb
@@ -174,6 +188,7 @@ test_files:
 - test/factories/host.rb
 - test/factories/foreman_wreckingball_factories.rb
 - test/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem_test.rb
+- test/actions/foreman_wreckingball/host/remediate_hardware_version_test.rb
 - test/actions/foreman_wreckingball/host/refresh_vmware_facet_test.rb
 - test/actions/foreman_wreckingball/vmware/sync_compute_resource_test.rb
 - test/actions/foreman_wreckingball/vmware/schedule_vmware_sync_test.rb

data/app/services/foreman_wreckingball/debris_collector.rb

@@ -1,249 +0,0 @@
-require 'rbvmomi'
-
-module ForemanWreckingball
-  class DebrisCollector
-
-    PROPERTY_MAPPING = {
-      :VirtualMachine => {
-        mapped: {
-          cpus: 'config.hardware.numCPU',
-          corespersocket: 'config.hardware.numCoresPerSocket',
-          memory_mb: 'config.hardware.memoryMB',
-          tools_state: 'guest.toolsStatus',
-          guest_id: 'config.guestId',
-          cpu_hot_add: 'config.cpuHotAddEnabled',
-          hardware_version: 'config.version',
-          #cpu_features: ''
-        },
-        additional: [
-          'name',
-          'config.instanceUuid'
-        ]
-      },
-      :Folder => {
-        mapped: {
-          name: 'name'
-        },
-        additional: [
-          'childEntity'
-        ]
-      },
-    }.freeze
-
-    attr_reader :compute_resource
-    attr_accessor :version, :stop_requested
-
-    delegate :logger, to: ::Rails
-
-    def initialize(compute_resource:)
-      logger.debug "Wreckingball Debris Collector: Initializing."
-      @compute_resource = compute_resource
-      self.version = ''
-      self.stop_requested = false
-    end
-
-
-    def run
-      logger.debug "Wreckingball Debris Collector: Started."
-
-      property_filter
-
-      logger.debug "Wreckingball Debris Collector: Starting initial import."
-      initial_refresh
-      logger.debug "Wreckingball Debris Collector: Finished initial import."
-
-      logger.debug "Wreckingball Debris Collector: Finished."
-    ensure
-      destroy_property_filter
-    end
-
-    def stop
-      logger.debug "Wreckingball Debris Collector: Stop requested."
-      self.stop_requested = true
-    end
-
-    private
-
-    def initial_refresh
-      monitor_updates
-    end
-
-    def monitor_updates
-      begin
-        update_set = wait_for_updates
-        return version if update_set.nil?
-
-        self.version = update_set.version
-        process_update_set(update_set)
-      end while update_set.truncated
-    end
-
-    def process_update_set(update_set)
-      property_filter_update = update_set.filterSet.to_a.detect do |update|
-        update.filter == property_filter
-      end
-      return if property_filter_update.nil?
-
-      object_update_set = property_filter_update.objectSet
-      return if object_update_set.blank?
-
-      logger.debug "Wreckingball Debris Collector: Processing #{object_update_set.count} updates..."
-
-      process_object_update_set(object_update_set)
-
-      logger.debug "Wreckingball Debris Collector: Processing #{object_update_set.count} updates... completed."
-    end
-
-    def process_object_update_set(object_update_set)
-      object_update_set.each do |object_update|
-        process_object_update(object_update)
-      end
-    end
-
-    def process_object_update(object_update)
-      managed_object = object_update.obj
-
-      logger.debug "#{object_update.kind} #{object_update.obj.class.wsdl_name}:#{object_update.obj._ref}"
-
-      case object_update.obj.class.wsdl_name
-      when 'VirtualMachine'
-        process_virtual_machine_update(object_update)
-      else
-        # Ignore this for now
-      end
-    end
-
-    def process_virtual_machine_update(object_update)
-      managed_object = object_update.obj
-      # TODO: Cache this
-      uuid = managed_object.config.instanceUuid
-
-      logger.error "Processing for uuid #{uuid}"
-
-      host = Host::Managed.find_by(compute_resource: compute_resource, uuid: uuid)
-
-      return unless host
-
-      facet = host.vmware_facet || host.build_vmware_facet
-
-      # TODO: Cluster
-      facet.update(
-        map_update_to_properties(:VirtualMachine, object_update.changeSet)
-      )
-    end
-
-    def map_update_to_properties(type, change_set)
-      mapping = PROPERTY_MAPPING[type][:mapped]
-
-      change_set.each_with_object({}) do |property_change, hsh|
-        hsh[mapping.key(property_change.name)] = property_change.val if mapping.key(property_change.name)
-      end
-    end
-
-    def wait_for_updates
-      connection.propertyCollector.WaitForUpdatesEx(
-        :version => version,
-        :options => wait_for_updates_options
-      )
-    end
-
-    def wait_for_updates_options
-      RbVmomi::VIM.WaitOptions(
-        :maxWaitSeconds => 10
-      )
-    end
-
-    def property_filter
-      @property_filter ||= create_property_filter
-    end
-
-    def property_set
-      PROPERTY_MAPPING.map do |type, properties|
-        RbVmomi::VIM::PropertySpec(
-          type: type,
-          pathSet: properties[:mapped].values + (properties[:additional] || [])
-        )
-      end
-    end
-
-    def traversal_spec_folder_to_child_entity
-      RbVmomi::VIM.TraversalSpec(
-        :name => 'FolderTraversalSpec',
-        :type => 'Folder',
-        :path => 'childEntity',
-        :skip => false,
-        :selectSet => [
-          RbVmomi::VIM.SelectionSpec(:name => 'FolderTraversalSpec'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsDcToDsFolder'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsDcToHostFolder'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsDcToNetworkFolder'),
-          RbVmomi::VIM.SelectionSpec(:name => 'DatacenterToVmFolderTraversalSpec'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsCrToHost'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsCrToRp'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsRpToRp'),
-          #RbVmomi::VIM.SelectionSpec(:name => 'tsRpToVm')
-        ]
-      )
-    end
-
-    def traversal_spec_datacenter_to_vm_folder
-      RbVmomi::VIM.TraversalSpec(
-        :name => 'DatacenterToVmFolderTraversalSpec',
-        :type => 'Datacenter',
-        :path => 'vmFolder',
-        :skip => false,
-        :selectSet => [
-          RbVmomi::VIM.SelectionSpec(:name => 'FolderTraversalSpec')
-        ]
-      )
-    end
-
-    def object_set(root)
-      traversal_spec = [
-        traversal_spec_folder_to_child_entity,
-        #datacenter_to_datastore_folder,
-        #datacenter_to_host_folder,
-        #datacenter_to_network_folder,
-        traversal_spec_datacenter_to_vm_folder
-        #compute_resource_to_host,
-        #compute_resource_to_resource_pool,
-        #resource_pool_to_resource_pool,
-        #resource_pool_to_vm,
-      ]
-
-      RbVmomi::VIM.ObjectSpec(
-        :obj => root,
-        :selectSet => traversal_spec
-      )
-    end
-
-    def create_property_filter
-      property_filter_spec = RbVmomi::VIM.PropertyFilterSpec(
-        :objectSet => [
-          object_set(
-            root_folder
-          )
-        ],
-        :propSet => property_set
-      )
-
-      connection.propertyCollector.CreateFilter(
-        :spec => property_filter_spec,
-        :partialUpdates => true
-      )
-    end
-
-    def destroy_property_filter
-      return unless @property_filter
-      @property_filter.DestroyPropertyFilter
-    end
-
-    def root_folder
-      connection.serviceContent.rootFolder
-    end
-
-    def connection
-      compute_resource.send(:client).send(:connection)
-    end
-  end
-end