Merge pull request #17863 from hstastna/Error_refresh_relationships_v…

…m_instance Fix Refresh Relationships and Power States button for VMs, Instances, Images
ManageIQ · Sep 4, 2018 · b1acd59 · b1acd59
2 parents 1646567 + 493d20f
commit b1acd59
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 0 deletions.
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
@@ -1,5 +1,6 @@
 class ExtManagementSystem < ApplicationRecord
   include CustomActionsMixin
+  include SupportsFeatureMixin
 
   def self.types
     leaf_subclasses.collect(&:ems_type)
@@ -90,6 +91,8 @@ def self.api_allowed_attributes
 
   serialize :options
 
+  supports :refresh_ems
+
   def hostname_uniqueness_valid?
     return unless hostname_required?
     return unless hostname.present? # Presence is checked elsewhere

diff --git a/app/models/host.rb b/app/models/host.rb
@@ -183,6 +183,7 @@ class Host < ApplicationRecord
       unsupported_reason_add(:reset, _("The Host has invalid IPMI credentials"))
     end
   end
+  supports :refresh_ems
 
   def self.non_clustered
     where(:ems_cluster_id => nil)

diff --git a/app/models/mixins/supports_feature_mixin.rb b/app/models/mixins/supports_feature_mixin.rb
@@ -110,6 +110,7 @@ module SupportsFeatureMixin
     :reconfigure_disksize                => 'Reconfigure Virtual Machines Disk Size',
     :reconfigure_network_adapters        => 'Reconfigure Network Adapters',
     :reconfigure_cdroms                  => 'Reconfigure Virtual Machines CD/DVDs',
+    :refresh_ems                         => 'Refresh Relationships and Power States',
     :refresh_network_interfaces          => 'Refresh Network Interfaces for a Host',
     :refresh_new_target                  => 'Refresh non-existing record',
     :regions                             => 'Regions of a Provider',

diff --git a/app/models/orchestration_stack.rb b/app/models/orchestration_stack.rb
@@ -54,6 +54,7 @@ class OrchestrationStack < ApplicationRecord
   alias_method :orchestration_stack_outputs,    :outputs
   alias_method :orchestration_stack_resources,  :resources
 
+  supports :refresh_ems
   supports :retire
 
   def orchestration_stacks

diff --git a/app/models/physical_chassis.rb b/app/models/physical_chassis.rb
@@ -17,6 +17,8 @@ class PhysicalChassis < ApplicationRecord
   has_one :asset_detail, :as => :resource, :dependent => :destroy, :inverse_of => false
   has_many :guest_devices, :through => :hardware
 
+  supports :refresh_ems
+
   def my_zone
     ems = ext_management_system
     ems ? ems.my_zone : MiqServer.my_zone

diff --git a/app/models/physical_rack.rb b/app/models/physical_rack.rb
@@ -1,4 +1,6 @@
 class PhysicalRack < ApplicationRecord
+  include SupportsFeatureMixin
+
   acts_as_miq_taggable
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :inverse_of => :physical_racks,
@@ -7,6 +9,8 @@ class PhysicalRack < ApplicationRecord
   has_many :physical_servers, :dependent => :nullify, :inverse_of => :physical_rack
   has_many :physical_storages, :dependent => :nullify, :inverse_of => :physical_rack
 
+  supports :refresh_ems
+
   def my_zone
     ems = ext_management_system
     ems ? ems.my_zone : MiqServer.my_zone

diff --git a/app/models/physical_server.rb b/app/models/physical_server.rb
@@ -36,6 +36,8 @@ class PhysicalServer < ApplicationRecord
 
   has_many :physical_switches, :through => :computer_system, :source => :connected_physical_switches
 
+  supports :refresh_ems
+
   def name_with_details
     details % {
       :name => name,

diff --git a/app/models/physical_storage.rb b/app/models/physical_storage.rb
@@ -1,4 +1,6 @@
 class PhysicalStorage < ApplicationRecord
+  include SupportsFeatureMixin
+
   belongs_to :ext_management_system, :foreign_key => :ems_id, :inverse_of => :physical_storages,
    :class_name => "ManageIQ::Providers::PhysicalInfraManager"
   belongs_to :physical_rack, :foreign_key => :physical_rack_id, :inverse_of => :physical_storages
@@ -13,6 +15,8 @@ class PhysicalStorage < ApplicationRecord
 
   has_many :physical_disks, :dependent => :destroy, :inverse_of => :physical_storage
 
+  supports :refresh_ems
+
   def my_zone
     ems = ext_management_system
     ems ? ems.my_zone : MiqServer.my_zone

diff --git a/app/models/physical_switch.rb b/app/models/physical_switch.rb
@@ -19,6 +19,8 @@ class PhysicalSwitch < Switch
 
   alias_attribute :physical_servers, :connected_physical_servers
 
+  supports :refresh_ems
+
   def my_zone
     ems = ext_management_system
     ems ? ems.my_zone : MiqServer.my_zone

diff --git a/app/models/provider.rb b/app/models/provider.rb
@@ -3,6 +3,7 @@ class Provider < ApplicationRecord
   include AuthenticationMixin
   include AsyncDeleteMixin
   include EmsRefresh::Manager
+  include SupportsFeatureMixin
   include TenancyMixin
 
   belongs_to :tenant
@@ -20,6 +21,8 @@ class Provider < ApplicationRecord
   virtual_column :verify_ssl,        :type => :integer
   virtual_column :security_protocol, :type => :string
 
+  supports :refresh_ems
+
   def self.leaf_subclasses
     descendants.select { |d| d.subclasses.empty? }
   end

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
@@ -1728,6 +1728,7 @@ def self.includes_template?(ids)
 
   supports_not :snapshots
   supports :destroy
+  supports :refresh_ems
 
   # Stop showing Reconfigure VM task unless the subclass allows
   def reconfigurable?