Simplify configured_systems queue_name_for_ems_ops

ManageIQ · Jan 27, 2020 · 6bc4102 · 6bc4102
1 parent b379569
commit 6bc4102
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/models/configured_system.rb b/app/models/configured_system.rb
@@ -28,7 +28,7 @@ class ConfiguredSystem < ApplicationRecord
   delegate :name, :to => :customization_script_ptable,   :prefix => true, :allow_nil => true
   delegate :name, :to => :operating_system_flavor,       :prefix => true, :allow_nil => true
   delegate :name, :to => :provider,                      :prefix => true, :allow_nil => true
-  delegate :my_zone, :provider, :zone, :to => :manager
+  delegate :my_zone, :provider, :queue_name_for_ems_operations, :zone, :to => :manager
 
   virtual_column  :my_zone,                            :type => :string
   virtual_column  :configuration_architecture_name,    :type => :string

diff --git a/app/models/miq_provision_configured_system_request.rb b/app/models/miq_provision_configured_system_request.rb
@@ -26,7 +26,7 @@ def my_role(_action = nil)
   end
 
   def my_queue_name
-    src_configured_systems.first&.manager&.queue_name_for_ems_operations
+    src_configured_systems.first.nil? ? super : src_configured_systems.first&.queue_name_for_ems_operations
   end
 
   def self.request_task_class_from(_attribs)

diff --git a/spec/models/physical_server_firmware_update_request_spec.rb b/spec/models/physical_server_firmware_update_request_spec.rb
@@ -19,6 +19,10 @@
     expect(subject.my_role).to eq('ems_operations')
   end
 
+  it '#my_queue_name' do
+    expect(subject.my_queue_name).to be_nil
+  end
+
   it '#requested_task_idx' do
     expect(subject.requested_task_idx).to eq([-1])
   end