Merge pull request ManageIQ#17708 from bdunne/17695_followup

Followup to ManageIQ#17695
d-m-u · Jul 14, 2018 · f07d954 · f07d954
2 parents d101c79 + 7614e3e
commit f07d954
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/app/models/container.rb b/app/models/container.rb
@@ -20,7 +20,7 @@ class Container < ApplicationRecord
   has_many   :metrics, :as => :resource
   has_many   :metric_rollups, :as => :resource
   has_many   :vim_performance_states, :as => :resource
-  delegate   :my_zone, :to => :ext_management_system
+  delegate   :my_zone, :to => :ext_management_system, :allow_nil => true
 
   include EventMixin
   include Metric::CiMixin

diff --git a/app/models/container_group.rb b/app/models/container_group.rb
@@ -33,7 +33,7 @@ class ContainerGroup < ApplicationRecord
   has_many :metrics, :as => :resource
   has_many :metric_rollups, :as => :resource
   has_many :vim_performance_states, :as => :resource
-  delegate :my_zone, :to => :ext_management_system
+  delegate :my_zone, :to => :ext_management_system, :allow_nil => true
 
   virtual_column :ready_condition_status, :type => :string, :uses => :container_conditions
   virtual_column :running_containers_summary, :type => :string

diff --git a/app/models/container_image.rb b/app/models/container_image.rb
@@ -37,7 +37,7 @@ class ContainerImage < ApplicationRecord
 
   after_create :raise_creation_event
 
-  delegate :my_zone, :to => :ext_management_system
+  delegate :my_zone, :to => :ext_management_system, :allow_nil => true
 
   def full_name
     return docker_id if image_ref && image_ref.start_with?(DOCKER_PULLABLE_PREFIX)

diff --git a/app/models/container_node.rb b/app/models/container_node.rb
@@ -32,7 +32,7 @@ class ContainerNode < ApplicationRecord
   has_many :metric_rollups, :as => :resource
   has_many :vim_performance_states, :as => :resource
   has_many :miq_alert_statuses, :as => :resource
-  delegate :my_zone, :to => :ext_management_system
+  delegate :my_zone, :to => :ext_management_system, :allow_nil => true
 
 
   virtual_column :ready_condition_status, :type => :string, :uses => :container_conditions

diff --git a/app/models/container_project.rb b/app/models/container_project.rb
@@ -46,7 +46,7 @@ class ContainerProject < ApplicationRecord
 
   PERF_ROLLUP_CHILDREN = :all_container_groups
 
-  delegate :my_zone, :to => :ext_management_system
+  delegate :my_zone, :to => :ext_management_system, :allow_nil => true
 
   def all_container_groups
     ContainerGroup.where(:container_project_id => id).or(ContainerGroup.where(:old_container_project_id => id))