Merge pull request #13810 from zakiva/archived_pod_reports

Container Project reports: add archived Container Groups
ManageIQ · Feb 28, 2017 · 7297ab7 · 7297ab7
2 parents 8710eed + 0598ad4
commit 7297ab7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/models/container_project.rb b/app/models/container_project.rb
@@ -17,6 +17,7 @@ class ContainerProject < ApplicationRecord
  has_many :container_limit_items, :through => :container_limits
  has_many :container_builds
  has_many :container_templates
+ has_many :archived_container_groups, :foreign_key => "old_container_project_id", :class_name => "ContainerGroup"
 
  # Needed for metrics
  has_many :metrics, :as => :resource

diff --git a/lib/miq_expression.rb b/lib/miq_expression.rb
@@ -77,6 +77,7 @@ class MiqExpression
 
  INCLUDE_TABLES = %w(
  advanced_settings
+ archived_container_groups
  audit_events
  availability_zones
  cloud_networks