katello 3.5.0.1 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a070a3e9504bd584dd952df64d047a5d1a0cda1
-  data.tar.gz: d0fb47076f925e71a859e90d5514f9a7f904554c
+  metadata.gz: 2a0751952f0fbdb40851ce737b113a3fbd77e811
+  data.tar.gz: 3ae959a2dd6903caed983427538d90bc01f4a307
 SHA512:
-  metadata.gz: 666da07ac0a8d41a19f4083387676603fbe0bd1d869c87de41f2f72d789468768d66197d63cca3f95bffc53d2831b9508b7637a80b7cad353c08954b5ebd69d9
-  data.tar.gz: 1af061cbfbe3109018cf6d5333f91c2b116f5187b37f68bbeab413b0140108223c7d8fb269f70e4b69b6a69fdd7a9993ee123c7695cb301a76c0ddbecd34b04c
+  metadata.gz: 97c9319edd494495ffb46c60f9d03304203960668f00b140fcf404a1533104cf8d48124c74349a780ec6a06a5aedbcea5686fc4f6a28ecf9bc9ca8db0f3b48b1
+  data.tar.gz: e79aa09e6fc0e61654e047d0bfda6c390e345e1565ede7a97095f016c6523c5965a52df91406f1deee88d2f12f7688d07b33106586abc69678f3dc9fb134f9d5

data/README.md

@@ -4,11 +4,11 @@
 [![Code Climate](https://codeclimate.com/github/Katello/katello/badges/gpa.svg)](https://codeclimate.com/github/Katello/katello)
 [![Dependency Status](https://gemnasium.com/Katello/katello.svg)](https://gemnasium.com/Katello/katello)
 
-Full documentation is at http://www.katello.org
+Full documentation is at https://www.theforeman.org/plugins/katello/
 
 ## About
 
-[Katello](http://www.katello.org) is a systems life cycle management
+[Katello](https://www.theforeman.org/plugins/katello/) is a systems life cycle management
 plugin to [Foreman](http://www.theforeman.org). Katello allows you to manage
 thousands of machines with one click. Katello can pull content
 from remote repositories into isolated environments, and make subscriptions
@@ -65,7 +65,7 @@ That's rather unfortunate. But don't worry! We can help. Just file a bug
 
 ## Contributing
 
-See the [developer documentation](http://www.katello.org/developers/index.html).
+See the [developer documentation](https://www.theforeman.org/plugins/katello/developers).
 
 ## Annotated Pulp and Candlepin Workflows and test Scenarios
 
@@ -73,7 +73,7 @@ See the [annotation docs](./test/scenarios/README.md) for more information.
 
 ## Contact & Resources
 
- * [Katello.org](http://katello.org)
+ * [theforeman.org](https://theforeman.org/plugins/katello)
  * [Foreman User Mailing List](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
  * [Foreman Developer mailing list](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
  * [IRC Freenode](http://freenode.net/using_the_network.shtml): #theforeman-dev
@@ -81,4 +81,4 @@ See the [annotation docs](./test/scenarios/README.md) for more information.
 ## Documentation
 
 Most of our documentation (both for users and developers) can be found at
-[Katello.org](http://www.katello.org).
+[theforeman.org](https://www.theforeman.org/plugins/katello).

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -215,7 +215,7 @@ module Katello
     param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
       param :content_label, String, :desc => N_("Label of the content"), :required => true
       param :value, String, :desc => N_("Override value. Provide a boolean value if name is 'enabled'"), :required => false
-      param :name, String, :desc => N_("Override key or name. Note if name is not provided the default name will be 'enabled'"), :required => false
+      param :name, String, :desc => N_("Override parameter key or name. Note if name is not provided the default name will be 'enabled'"), :required => false
       param :remove, :bool, :desc => N_("Set true to remove an override and reset it to 'default'"), :required => false
     end
     def content_override

data/app/controllers/katello/api/v2/docker_tags_controller.rb

@@ -9,7 +9,7 @@ module Katello
       page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
       tags = Katello::DockerMetaTag.in_repositories(@repositories)
       col = "#{Katello::DockerMetaTag.table_name}.name"
-      tags = tags.where("#{Katello::DockerTag.table_name}.name ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      tags = tags.where("#{col} ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
       render :json => tags.pluck(col)
     end
 

data/app/lib/actions/katello/host/register.rb

@@ -83,7 +83,8 @@ module Actions
 
           host_collection_ids.each do |host_collection_id|
             host_collection = ::Katello::HostCollection.find(host_collection_id)
-            if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0
+            if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0 &&
+              host_collection.hosts.length >= host_collection.max_hosts
               fail _("Host collection '%{name}' exceeds maximum usage limit of '%{limit}'") %
                        {:limit => host_collection.max_hosts, :name => host_collection.name}
             end

data/app/lib/actions/katello/repository/check_matching_content.rb

@@ -19,7 +19,7 @@ module Actions
           package_groups = package_groups_match?(source_repo, target_repo)
           distributions = distributions_match?(source_repo, target_repo)
 
-          output[:matching_content] = rpms && errata && package_groups && distributions
+          output[:matching_content] = rpms && errata && package_groups && distributions && target_repo.published?
         end
 
         def rpms_match?(source_repo, target_repo)

data/app/lib/actions/katello/repository/sync.rb

@@ -22,6 +22,7 @@ module Actions
           incremental = options.fetch(:incremental, false)
           validate_contents = options.fetch(:validate_contents, false)
           skip_metadata_check = options.fetch(:skip_metadata_check, false) || validate_contents
+          generate_applicability = repo.yum?
 
           pulp_sync_options = {}
           pulp_sync_options[:download_policy] = ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND if validate_contents
@@ -44,11 +45,11 @@ module Actions
               plan_action(Pulp::Repository::Download, :pulp_id => repo.pulp_id, :options => {:verify_all_units => true}) if validate_contents
               plan_action(Katello::Repository::MetadataGenerate, repo, :force => true) if skip_metadata_check
               plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
-              plan_action(Pulp::Repository::RegenerateApplicability, :pulp_id => repo.pulp_id, :contents_changed => contents_changed)
+              plan_action(Pulp::Repository::RegenerateApplicability, :pulp_id => repo.pulp_id, :contents_changed => contents_changed) if generate_applicability
             end
             plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
                       :contents_changed => contents_changed)
-            plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed)
+            plan_action(Katello::Repository::ImportApplicability, :repo_id => repo.id, :contents_changed => contents_changed) if generate_applicability
           end
         end
 

data/app/lib/katello/util/package_clause_generator.rb

@@ -51,7 +51,6 @@ module Katello
       # input ->  [{"type"=>{"$in"=>[:bugfix, :security]}}] <- Errata Pulp Clauses
       # output -> {"filename" => {"$in" => {"foo.el6.noarch", "..."}}} <- Packages belonging to those errata
       def package_clauses_for_errata(errata_clauses = [])
-        errata_clauses = {"$or" => errata_clauses}
         pkg_filenames = Katello::Erratum.list_filenames_by_clauses(@repo, errata_clauses)
         {'filename' => {"$in" => pkg_filenames}} unless pkg_filenames.empty?
       end

data/app/lib/katello/validators/content_view_environment_validator.rb

@@ -6,9 +6,9 @@ module Katello
         environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
 
         if record.content_view_id && environment_id
-          view = ContentView.find(record.content_view_id)
-          env = KTEnvironment.find(environment_id)
-          unless view.in_environment?(env)
+          view = ContentView.where(:id => record.content_view_id).first
+          env = KTEnvironment.where(:id => environment_id).first
+          unless view.blank? || env.blank? || view.in_environment?(env)
             record.errors[:base] << _("Content view '%{view}' is not in environment '%{env}'") %
                                       {:view => view.name, :env => env.name}
           end

data/app/models/katello/activation_key.rb

@@ -145,8 +145,9 @@ module Katello
     end
 
     def self.find_by_subscription_id(_key, operator, value)
-      conditions = sanitize_sql_for_conditions(["#{Katello::Subscription.table_name}.id #{operator} ?", value_to_sql(operator, value)])
-      activation_keys = ::Katello::ActivationKey.joins(pools: :subscription).where(conditions)
+      # What we refer to as "subscriptions" is really Pools, so we search based on Pool id.
+      conditions = sanitize_sql_for_conditions(["#{Katello::Pool.table_name}.id #{operator} ?", value_to_sql(operator, value)])
+      activation_keys = ::Katello::ActivationKey.joins(:pools).where(conditions)
       return_activation_keys_by_id(activation_keys.pluck(:id))
     end
 

data/app/models/katello/concerns/content_facet_host_extensions.rb

@@ -49,7 +49,7 @@ module Katello
         )
 
         def content_facet_ignore_update?(attributes)
-          self.content_facet.blank? && attributes.blank?
+          self.content_facet.blank? && attributes.values.all?(&:blank?)
         end
       end
 

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -5,6 +5,18 @@ module Katello
       include Katello::KatelloUrlsHelper
       include ForemanTasks::Concerns::ActionSubject
 
+      module Overrides
+        def validate_media?
+          (content_source_id.blank? || (content_facet && content_facet.kickstart_repository.blank?)) && super
+        end
+
+        def smart_proxy_ids
+          ids = super
+          ids << content_source_id
+          ids.uniq.compact
+        end
+      end
+
       included do
         alias_method_chain :validate_media?, :capsule
         alias_method_chain :smart_proxy_ids, :katello
@@ -63,13 +75,7 @@ module Katello
       end
 
       def import_package_profile(simple_packages)
-        if Setting[:bulk_query_installed_packages]
-          #this method is slow if the clean_installed_packages rake task has not been run, but faster if it has
-          found = import_package_profile_in_bulk(simple_packages)
-        else
-          found = import_package_profile_individually(simple_packages)
-        end
-
+        found = import_package_profile_in_bulk(simple_packages)
         sync_package_associations(found.map(&:id))
       end
 
@@ -87,21 +93,6 @@ module Katello
         found
       end
 
-      def import_package_profile_individually(simple_packages)
-        found = []
-        simple_packages.each do |simple_package|
-          ::Katello::Util::Support.active_record_retry do
-            #use limit(1)[0] here to avoid a sort by id
-            pkg = InstalledPackage.where(:nvra => simple_package.nvra, :name => simple_package.name).limit(1)[0]
-            if pkg.nil?
-              pkg = InstalledPackage.create!(:nvra => simple_package.nvra, :name => simple_package.name)
-            end
-            found << pkg
-          end
-        end
-        found
-      end
-
       def sync_package_associations(new_installed_package_ids)
         old_associated_ids = self.installed_package_ids
         table_name = self.host_installed_packages.table_name

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -1,3 +1,6 @@
+require 'proxy_api'
+require 'proxy_api/pulp'
+require 'proxy_api/pulp_node'
 module Katello
   module Concerns
     module SmartProxyExtensions

data/app/models/katello/content_view.rb

@@ -80,6 +80,10 @@ module Katello
       hosts.count
     end
 
+    def component_ids
+      components.map(&:id)
+    end
+
     def components
       content_view_components.map(&:latest_version).compact.freeze
     end
@@ -316,6 +320,10 @@ module Katello
       components.map(&:archived_repos).flatten
     end
 
+    def component_repository_ids
+      component_repositories.map(&:id)
+    end
+
     def repos_in_product(env, product)
       version = version(env)
       if version

data/app/models/katello/content_view_erratum_filter.rb

@@ -16,40 +16,56 @@ module Katello
 
       if filter_by_id?
         errata_ids = erratum_rules.map(&:errata_id)
-        return { "id" => { "$in" => errata_ids } } unless errata_ids.empty?
-
+        errata_in(errata_ids) unless errata_ids.empty?
       else # filtering by date/type
-        rule_clauses = []
-        start_date = erratum_rules.first.start_date
-        end_date = erratum_rules.first.end_date
-        types = erratum_rules.first.types
-
-        unless start_date.blank? && end_date.blank?
-          date_range = {}
-          date_range["$gte"] = start_date.to_time.utc.as_json unless start_date.blank?
-          date_range["$lte"] = end_date.to_time.utc.as_json unless end_date.blank?
-          rule_clauses << { erratum_rules.first.pulp_date_type => date_range }
-        end
-        unless types.blank?
-          # {"type": {"$in": ["security", "enhancement", "bugfix"]}
-          rule_clauses << { "type" => { "$in" => types } }
-        end
-
-        # Currently, an errata filter that specifies a date/type, will only have
-        # single rule; therefore, we can return from here.
-        case rule_clauses.size
-        when 0
-          return
-        when 1
-          return rule_clauses.first
-        else
-          return { '$and' => rule_clauses }
-        end
+        clauses = []
+        clauses << errata_from
+        clauses << errata_to
+        clauses << types_clause
+        clauses.compact.inject(&:and)
       end
     end
 
+    private
+
+    def erratum_arel
+      ::Katello::Erratum.arel_table
+    end
+
+    def types_clause
+      types = erratum_rules.first.types
+      return if types.blank?
+      errata_types_in(types)
+    end
+
     def filter_by_id?
       !erratum_rules.blank? && !erratum_rules.first.errata_id.blank?
     end
+
+    def errata_types_in(types)
+      erratum_arel[:errata_type].in(types)
+    end
+
+    def errata_in(ids)
+      erratum_arel[:errata_id].in(ids)
+    end
+
+    def errata_from
+      start_date = erratum_rules.first.start_date
+      return if start_date.blank?
+      date_type = erratum_rules.first.pulp_date_type.to_sym
+
+      # "katello_errata"."issued" >= '2017-11-23'
+      erratum_arel[date_type].gteq(start_date)
+    end
+
+    def errata_to
+      end_date = erratum_rules.first.end_date
+      return if end_date.blank?
+      date_type = erratum_rules.first.pulp_date_type.to_sym
+
+      # "katello_errata"."issued" <= '2017-11-23'
+      erratum_arel[date_type].lteq(end_date)
+    end
   end
 end

data/app/models/katello/erratum.rb

@@ -134,10 +134,14 @@ module Katello
     end
 
     def self.list_filenames_by_clauses(repo, clauses)
-      errata = Katello.pulp_server.extensions.errata.search(Katello::Erratum::CONTENT_TYPE, :filters => clauses)
+      query_clauses = clauses.map do |clause|
+        "(#{clause.to_sql})"
+      end
+      statement = query_clauses.join(" OR ")
+
       Katello::ErratumPackage.joins(:erratum => :repository_errata).
-          where("#{RepositoryErratum.table_name}.repository_id" => repo.id,
-                "#{Erratum.table_name}.uuid" => errata.map { |e| e['_id'] }).pluck(:filename)
+          where("#{RepositoryErratum.table_name}.repository_id" => repo.id).
+          where(statement).pluck(:filename)
     end
 
     private

data/app/models/katello/glue/candlepin/pool.rb

@@ -9,7 +9,7 @@ module Katello
         lazy_accessor :pool_facts, :initializer => lambda { |_s| self.import_lazy_attributes }
         lazy_accessor :subscription_facts, :initializer => lambda { |_s| self.subscription ? self.subscription.attributes : {} }
 
-        lazy_accessor :pool_derived, :owner, :source_pool_id, :host_id, :virt_limit, :arch, :description,
+        lazy_accessor :pool_derived, :owner, :source_pool_id, :virt_limit, :arch, :description,
           :product_family, :variant, :suggested_quantity, :support_type, :product_id, :type,
           :initializer => :pool_facts
 
@@ -49,8 +49,6 @@ module Katello
         pool_attributes.each do |attr|
           json[attr["name"]] = attr["value"]
           case attr["name"]
-          when 'requires_host'
-            json["host_id"] = attr['value']
           when 'virt_limit'
             json["virt_limit"] = attr['value'].to_i
           when 'support_type'
@@ -93,6 +91,7 @@ module Katello
         subscription
       end
 
+      # rubocop:disable MethodLength
       def import_data(index_hosts = true)
         pool_attributes = {}.with_indifferent_access
         pool_json = self.backend_data
@@ -120,7 +119,11 @@ module Katello
         if pool_attributes.key?(:virtual)
           pool_attributes[:virt_only] = pool_attributes["virtual"] == 'true' ? true : false
         end
-        pool_attributes[:host_id] = pool_attributes["requiresHost"] if pool_attributes.key?("requiresHost")
+
+        if pool_attributes.key?("requires_host")
+          pool_attributes[:hypervisor_id] = ::Katello::Host::SubscriptionFacet.find_by(:uuid => pool_attributes["requires_host"])
+                                                                              .try(:host_id)
+        end
 
         if pool_attributes.key?(:unmapped_guests_only) && pool_attributes[:unmapped_guests_only] == 'true'
           pool_attributes[:unmapped_guest] = true
@@ -134,6 +137,7 @@ module Katello
         self.create_activation_key_associations
         self.import_hosts if index_hosts
       end
+      # rubocop:enable MethodLength
 
       def import_hosts
         entitlements = Resources::Candlepin::Pool.entitlements(self.cp_id, ["consumer.uuid"])
@@ -164,7 +168,7 @@ module Katello
       end
 
       def hypervisor
-        ::Katello::Host::SubscriptionFacet.find_by(:uuid => host_id).try(:host) if host_id
+        ::Host.find_by(id: self.hypervisor_id) if self.hypervisor_id
       end
     end
   end

data/app/models/katello/glue/provider.rb

@@ -38,16 +38,6 @@ module Katello
         self.sync_status[:state]
       end
 
-      def sync_finish
-        finish_times = []
-        self.products.each do |r|
-          finish = r.sync_finish
-          finish_times << finish unless finish.nil?
-        end
-        finish_times.sort!
-        finish_times.last
-      end
-
       def sync_size
         self.products.inject(0) { |sum, v| sum + v.sync_status.progress.total_size }
       end

data/app/models/katello/glue/pulp/repo.rb

@@ -489,29 +489,6 @@ module Katello
         ]
       end
 
-      def sync_start
-        status = self.sync_status
-        retval = nil
-        if status.nil? || status['progress']['start_time'].nil?
-          retval = nil
-        else
-          retval = status['progress']['start_time']
-          # retval = date.strftime("%H:%M:%S %Y-%m-%d")
-        end
-        retval
-      end
-
-      def sync_finish
-        status = self.sync_status
-        retval = nil
-        if status.nil? || status['progress']['finish_time'].nil?
-          retval = nil
-        else
-          retval = status['progress']['finish_time']
-        end
-        retval
-      end
-
       def sync_status
         self._get_most_recent_sync_status if @sync_status.nil?
       end
@@ -641,6 +618,10 @@ module Katello
         self.content_type == Repository::OSTREE_TYPE
       end
 
+      def published?
+        distributors.map { |dist| dist['last_publish'] }.compact.any?
+      end
+
       def capsule_download_policy(capsule)
         policy = capsule.download_policy || Setting[:default_proxy_download_policy]
         if self.yum?

data/app/models/katello/glue/pulp/repos.rb

@@ -179,26 +179,6 @@ module Katello
         self.sync_status[:state]
       end
 
-      def sync_start
-        start_times = []
-        repos(library).each do |r|
-          start = r.sync_start
-          start_times << start unless start.nil?
-        end
-        start_times.sort!
-        start_times.last
-      end
-
-      def sync_finish
-        finish_times = []
-        repos(library).each do |r|
-          finish = r.sync_finish
-          finish_times << finish unless finish.nil?
-        end
-        finish_times.sort!
-        finish_times.last
-      end
-
       def sync_size
         self.repos(library).inject(0) do |sum, v|
           sum + v.sync_status.progress.total_size

data/app/models/katello/pool.rb

@@ -63,10 +63,6 @@ module Katello
       self.subscription.products if self.subscription
     end
 
-    def host
-      Katello::Host::SubscriptionFacet.find_by_uuid(host_id).try(:host) if host_id
-    end
-
     private
 
     def default_sort

data/app/models/setting/content.rb

@@ -40,8 +40,6 @@ class Setting::Content < Setting
                  false, N_('Restrict Composite Content View promotion')),
         self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."),
                  true, N_('Check services before actions')),
-        self.set('bulk_query_installed_packages', N_("Use a bulk query when looking up installed packages."),
-                 false, N_('Bulk query for installed packages.')),
         self.set('force_post_sync_actions', N_("Force post sync actions such as indexing and email even if no content was available."),
                  false, N_('Force post-sync actions')),
         self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "on_demand",

data/app/views/dashboard/_host_collection_widget.html.erb

@@ -22,11 +22,11 @@
         <tr>
           <td>
             <% if host_collection.security_updates? %>
-              <a href="/host_collections/<%= host_collection.id %>/actions" style="text-align: center"><i class="label label-danger">&nbsp;</i></a>
+              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-danger">&nbsp;</i></a>
             <% elsif host_collection.bugzilla_updates? || host_collection.enhancement_updates? %>
-              <a href="/host_collections/<%= host_collection.id %>/actions" style="text-align: center"><i class="label label-warning">&nbsp;</i></a>
+              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-warning">&nbsp;</i></a>
             <% else %>
-              <a href="/host_collections/<%= host_collection.id %>/actions" style="text-align: center"><i class="label label-success">&nbsp;</i></a>
+              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-success">&nbsp;</i></a>
             <% end %>
           </td>
           <td class='ellipsis'><%= host_collection.name %></td>

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -2,7 +2,6 @@ extends 'katello/api/v2/common/identifier'
 extends 'katello/api/v2/common/org_reference'
 
 attributes :composite
-attributes :repository_ids
 attributes :component_ids
 attributes :default
 attributes :force_puppet_environment
@@ -32,10 +31,12 @@ if @object.composite?
   child :component_repositories => :repositories do
     attributes :id, :name, :label, :content_type
   end
+  attributes :component_repository_ids => :repository_ids
 else
   child :repositories => :repositories do
     attributes :id, :name, :label, :content_type
   end
+  attributes :repository_ids
 end
 
 child :puppet_modules => :puppet_modules do

data/app/views/katello/api/v2/subscriptions/base.json.rabl

@@ -16,3 +16,10 @@ attributes :name => :product_name
 attributes :unmapped_guest
 attributes :virt_only
 attributes :virt_who
+
+node :hypervisor, :if => lambda { |sub| sub && sub.respond_to?(:hypervisor) && sub.hypervisor_id } do |subscription|
+  {
+    id: subscription.hypervisor.id,
+    name: subscription.hypervisor.name
+  }
+end

data/db/migrate/20171114150937_cleanup_installed_packages.rb

@@ -0,0 +1,55 @@
+class CleanupInstalledPackages < ActiveRecord::Migration
+  def up
+    create_table "katello_installed_packages_new", force: :cascade do |t|
+      t.string "name", limit: 255, null: false
+      t.string "nvra", limit: 255, null: false
+    end
+
+    create_table "katello_host_installed_packages_new", force: :cascade do |t|
+      t.integer "host_id",              null: false
+      t.integer "installed_package_id", null: false
+    end
+
+    #Copy unique entires to new table
+    execute('insert into katello_installed_packages_new(nvra, name)
+       select distinct(nvra) as nvra, name from katello_installed_packages')
+
+    #copy associations
+    execute('
+    insert into katello_host_installed_packages_new (host_id, installed_package_id)
+      select distinct katello_host_installed_packages.host_id, katello_installed_packages_new.id
+        from katello_installed_packages
+        inner join katello_host_installed_packages on  katello_host_installed_packages.installed_package_id = katello_installed_packages.id
+        inner join  katello_installed_packages_new on katello_installed_packages_new.nvra = katello_installed_packages.nvra')
+
+    remove_foreign_key :katello_host_installed_packages, name: "katello_host_installed_packages_installed_package_id"
+    remove_foreign_key :katello_host_installed_packages, name: "katello_host_installed_packages_host_id"
+
+    drop_table "katello_installed_packages"
+    drop_table "katello_host_installed_packages"
+
+    rename_table "katello_installed_packages_new", "katello_installed_packages"
+    rename_table "katello_host_installed_packages_new", "katello_host_installed_packages"
+
+    add_index :katello_installed_packages, [:name, :nvra]
+
+    add_foreign_key "katello_host_installed_packages", "hosts",
+                    :name => "katello_host_installed_packages_host_id", :column => "host_id"
+
+    add_foreign_key "katello_host_installed_packages", "katello_installed_packages",
+                    :name => "katello_host_installed_packages_installed_package_id", :column => "installed_package_id"
+
+    #At this point, everything should be back to where it was (sans-duplicates)
+    # Now do new things
+    add_index :katello_installed_packages, [:nvra], :unique => true
+    add_index :katello_host_installed_packages, [:host_id, :installed_package_id], :unique => true, :name => :katello_host_installed_packages_h_id_ip_id
+    Setting.where(:name => 'bulk_query_installed_packages', :category => 'Setting::Content').delete_all
+  end
+
+  def down
+    #only revert new things
+    remove_index :katello_installed_packages, [:nvra]
+    remove_index :katello_host_installed_packages, :name => :katello_host_installed_packages_h_id_ip_id
+    #Setting will be recreated on startup
+  end
+end

data/db/migrate/20171114183353_add_hypervisor_id_to_katello_pools.rb

@@ -0,0 +1,9 @@
+class AddHypervisorIdToKatelloPools < ActiveRecord::Migration
+  def up
+    add_column :katello_pools, :hypervisor_id, :integer
+  end
+
+  def down
+    remove_column :katello_pools, :hypervisor_id
+  end
+end

data/db/migrate/20171211124439_add_uuid_index_to_katello_subscription_facets.rb

@@ -0,0 +1,5 @@
+class AddUuidIndexToKatelloSubscriptionFacets < ActiveRecord::Migration
+  def change
+    add_index :katello_subscription_facets, :uuid
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -1,6 +1,6 @@
 angular.module('Bastion.activation-keys').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('activation-keys', {
-        url: '/activation_keys?search',
+        url: '/activation_keys',
         permission: 'view_activation_keys',
         template: '<div ui-view></div>',
         views: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js

@@ -8,13 +8,14 @@
  * @requires translate
  * @requires ActivationKey
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the list host collections details action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'ActivationKey', 'Nutupane',
-    function ($scope, $q, $location, translate, ActivationKey, Nutupane) {
+    ['$scope', '$q', '$location', 'translate', 'ActivationKey', 'Nutupane', 'Notification',
+    function ($scope, $q, $location, translate, ActivationKey, Nutupane, Notification) {
         var hostCollectionsPane, params;
 
         params = {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js

@@ -10,7 +10,7 @@
 
 angular.module('Bastion.content-hosts').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('content-hosts', {
-        url: '/content_hosts?search',
+        url: '/content_hosts',
         permission: 'view_hosts',
         views: {
             '@': {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js

@@ -40,10 +40,24 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
             }
         });
 
-        $scope.selectedTraceHelpers = function () {
-            var traceHelpers = [], selected = $scope.table.getSelected();
-            angular.forEach(selected, function (value) {
-                traceHelpers.push(value.helper);
+        $scope.selectedTraceHelpers = function() {
+            var traceHelpers = [],
+                selected = $scope.table.getSelected();
+
+            var reboot = selected.some(function(value) {
+                return value.app_type === "static";
+            });
+
+            if (reboot) {
+                return ["reboot"];
+            }
+
+            selected.forEach(function(value) {
+                if (value.app_type !== "session") {
+                    if (traceHelpers.indexOf(value.helper) === -1) {
+                        traceHelpers.push(value.helper);
+                    }
+                }
             });
             return traceHelpers;
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js

@@ -10,13 +10,14 @@
  * @requires Host
  * @requires CurrentOrganization
  * @requires Nutupane
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for adding host collections to a content host.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane',
-    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane) {
+    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane', 'Notification',
+    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane, Notification) {
         var params, nutupane;
 
         params = {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -44,7 +44,7 @@
 
         <dt ng-show="host.subscription_facet_attributes.virtual_guests" translate>Virtual Guests</dt>
         <dd ng-show="host.subscription_facet_attributes.virtual_guests">
-          <a ui-sref="content-hosts({search: virtualGuestIds(host)})"
+          <a ng-href="/content_hosts?search={{virtualGuestIds(host)}}"
              translate translate-n="host.subscription_facet_attributes.virtual_guests.length"
              translate-plural="{{ host.subscription_facet_attributes.virtual_guests.length }} Content Hosts">
             1 Content Host

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html

@@ -94,7 +94,7 @@
             </td>
             <td bst-table-cell>
               <div ng-if="repository.content_counts.rpm && repository.content_counts.rpm > 0">
-                <a ui-sref="products.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
+                <a ui-sref="product.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
                    ng-show="repository.content_type == 'yum'"
                    translate>
                   {{ repository.content_counts.rpm }} Packages

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details-tasks.html

@@ -1,4 +1,4 @@
-<div tasks-table  details-state="content-view.tasks.details"
+<div tasks-table  details-state="content-view.task"
                   known-context="content_view,organization"
                   resource-type="Katello::ContentView"
                   resource-id="{{ contentView.id }}"/>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-repositories.html

@@ -86,7 +86,7 @@
         </td>
         <td bst-table-cell>
           <div>
-            <a ui-sref="products.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
+            <a ui-sref="product.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
                ng-show="repository.content_type == 'yum'"
                translate>
               {{ repository.content_counts.rpm }} Packages

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html

@@ -14,7 +14,7 @@
         <td bst-table-cell>{{ repository.product.name }}</td>
         <td bst-table-cell>
           <div>
-            <a ui-sref="products.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})" translate>
+            <a ui-sref="product.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})" translate>
               {{ repository.content_counts.rpm }} Packages
             </a>
           </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js

@@ -9,13 +9,14 @@
  * @requires CurrentOrganization
  * @requires Host
  * @requires HostCollection
+ * @requires Notification
  *
  * @description
  *   Provides the functionality for the host collection add content hosts pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionAddHostsController',
-    ['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection',
-    function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection) {
+    ['$scope', '$state', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Host', 'HostCollection', 'Notification',
+    function ($scope, $state, $location, translate, Nutupane, CurrentOrganization, Host, HostCollection, Notification) {
         var contentNutupane, params, nutupaneParams;
 
         params = {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html

@@ -86,7 +86,7 @@
           <tr>
             <td>Content Hosts</td>
             <td>
-              <a ui-sref="content-hosts({search: searchQuery(subscription)})" translate>
+              <a ng-href="/content_hosts?search={{searchQuery(subscription)}}">
                 {{ subscription.host_count }}
               </a>
             </td>
@@ -94,7 +94,7 @@
           <tr>
             <td>Activation Keys</td>
             <td>
-              <a ui-sref="activation-keys({search: searchQuery(subscription)})" translate>
+              <a ng-href="/activation_keys?search={{searchQuery(subscription)}}">
                 {{ subscription.activation_keys.length }}
               </a>
             </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.routes.js

@@ -60,7 +60,7 @@ angular.module('Bastion.subscriptions').config(['$stateProvider', function ($sta
         }
     })
     .state('subscription.content-hosts', {
-        url: '/content-hosts?search',
+        url: '/content-hosts',
         permission: 'view_subscriptions',
         controller: 'SubscriptionContentHostsController',
         templateUrl: 'subscriptions/details/views/subscription-content-hosts.html',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html

@@ -2,7 +2,7 @@
 <div ng-if="subscription.virt_only === false">
   {{ 'Physical' | translate }}
 </div>
-<div ng-if="subscription.virt_only === true && !subscription.host">
+<div ng-if="subscription.virt_only === true && !subscription.hypervisor">
   <div ng-if="subscription.unmapped_guest !== true">
     {{ 'Virtual' | translate }}
   </div>
@@ -10,9 +10,9 @@
     {{ 'Temporary' | translate }}
   </div>
 </div>
-<div ng-if="subscription.virt_only === true && subscription.host">
+<div ng-if="subscription.virt_only === true && subscription.hypervisor">
   <span translate> Guests of </span>
-  <a ui-sref="content-hosts.details.info({hostId: subscription.host.id })">
-    {{ subscription.host.name }}
+  <a ui-sref="content-host.info({hostId: subscription.hypervisor.id })">
+    {{ subscription.hypervisor.name }}
   </a>
 </div>

data/lib/katello/permissions/host_permissions.rb

@@ -29,9 +29,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
-  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile',
-  'katello/remote_execution/new',
-  'katello/remote_execution/create'
+  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile'
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
@@ -47,7 +45,9 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',
   'katello/api/v2/host_packages/index',
-  'katello/api/v2/host_tracer/index'
+  'katello/api/v2/host_tracer/index',
+  'katello/remote_execution/new',
+  'katello/remote_execution/create'
 ]
 
 Foreman::AccessControl.permission(:destroy_hosts).actions.concat [

data/lib/katello/tasks/update_subscription_facet_backend_data.rake

@@ -7,9 +7,10 @@ namespace :katello do
 
     def report_errors
       if @errors.any?
+        path = "/var/log/foreman/"
+        path = "/tmp/" unless File.writable?(path)
         filename = "subscription_facet_upgrade-#{Time.now.to_i}.log"
-        path = "/var/log/foreman/#{filename}"
-        path = "/tmp/#{filename}" unless File.writable?(path)
+        path = File.join(path, filename)
 
         file = File.open(path, 'w')
         @errors.each { |error| file.write(error) }
@@ -36,7 +37,7 @@ namespace :katello do
       end
     end
 
-    Katello::Host::SubscriptionFacet.find_each do |subscription_facet|
+    Katello::Host::SubscriptionFacet.where.not(:uuid => nil).find_each do |subscription_facet|
       begin
         candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
         subscription_facet.import_database_attributes(candlepin_attrs)

data/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -1,64 +1,8 @@
 namespace :katello do
   namespace :upgrades do
     namespace '3.0' do
-      task :update_subscription_facet_backend_data => ["environment"] do
-        def error(message)
-          @errors << message
-          @errors << "\n"
-        end
-
-        def report_errors
-          if @errors.any?
-            filename = "subscription_facet_upgrade-#{Time.now.to_i}.log"
-            path = "/var/log/foreman/#{filename}"
-            path = "/tmp/#{filename}" unless File.writable?(path)
-
-            file = File.open(path, 'w')
-            @errors.each { |error| file.write(error) }
-            file.close
-            $stderr.print "***********************************\n"
-            $stderr.print "*************WARNING***************\n"
-            $stderr.print "Errors detected during upgrade step.\n"
-            $stderr.print "Details saved to: #{file.path}\n"
-            $stderr.print "This step can be rerun with:\n"
-            $stderr.print "  foreman-rake katello:upgrades:3.0:update_subscription_facet_backend_data\n"
-            $stderr.print "You are likely encountering a bug.\n"
-            $stderr.print "***********************************\n"
-          end
-        end
-
-        @errors ||= []
-        User.current = User.anonymous_api_admin
-        puts _("Updating backend data for subscription facets")
-
-        #there may be some invalid hosts, if there are create a primary interface
-        ::Host.includes(:interfaces).find_each do |host|
-          if host.primary_interface.nil?
-            host.interfaces.create!(:primary => true)
-          end
-        end
-
-        Katello::Host::SubscriptionFacet.where.not(:uuid => nil).find_each do |subscription_facet|
-          begin
-            candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
-            subscription_facet.import_database_attributes(candlepin_attrs)
-            subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
-            subscription_facet.save!
-
-            host = subscription_facet.host
-            host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
-            host.save! if host.name_changed?
-
-            Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
-          rescue StandardError => exception
-            error("Error: #{subscription_facet.host.name} - #{subscription_facet.host.id}")
-            error(candlepin_attrs)
-            error(exception.message)
-            error(exception.backtrace.join("\n"))
-            error("\n")
-          end
-        end
-        report_errors
+      task :update_subscription_facet_backend_data => ["environment", "katello:update_subscription_facet_backend_data"] do
+        #noop task
       end
     end
   end

data/lib/katello/tasks/upgrades/3.4/reindex_docker_tags.rake

@@ -0,0 +1,12 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.4' do
+      desc "Reindex docker tags to account for schema 1 and schema 2"
+      task :reindex_docker_tags => ["environment"] do
+        User.current = User.anonymous_admin
+        ::Katello::DockerManifest.import_all
+        ::Katello::DockerTag.import_all
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.5.0.1".freeze
+  VERSION = "3.5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.5.0.1
+  version: 3.5.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,30 +84,30 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: foreman_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: qpid_messaging
   requirement: !ruby/object:Gem::Requirement
@@ -1420,6 +1420,9 @@ files:
 - db/migrate/20170822104447_add_katello_content_to_image.rb
 - db/migrate/20170913183848_add_errata_counts.rb
 - db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb
+- db/migrate/20171114150937_cleanup_installed_packages.rb
+- db/migrate/20171114183353_add_hypervisor_id_to_katello_pools.rb
+- db/migrate/20171211124439_add_uuid_index_to_katello_subscription_facets.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1960,7 +1963,6 @@ files:
 - lib/katello/repository_types/puppet.rb
 - lib/katello/repository_types/yum.rb
 - lib/katello/tasks/clean_backend_objects.rake
-- lib/katello/tasks/clean_installed_packages.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/import_applicability.rake
@@ -1984,6 +1986,7 @@ files:
 - lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake
 - lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrades/3.3/hypervisors.rake
+- lib/katello/tasks/upgrades/3.4/reindex_docker_tags.rake
 - lib/katello/tasks/upgrades/3.4/remove_unused_products.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -2097,7 +2100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/katello/tasks/clean_installed_packages.rake

@@ -1,71 +0,0 @@
-namespace :katello do
-  desc "Clean duplicate installed packages"
-  task :clean_installed_packages => :environment do
-    User.current = User.anonymous_admin
-
-    puts "Populating cache"
-    cache = PackageCache.new
-    cache.populate
-
-    puts "Cleaning katello_host_installed_packages table.."
-    cleaning_start = Time.now
-    total = ::Host.count
-    count = 1
-    ::Host.find_each do |host|
-      puts "Host #{count}/#{total} #{host.name}"
-
-      if host.installed_package_ids.any?
-        nvras = host.installed_packages.pluck(:nvra)
-        ids = nvras.map { |nvra| cache.fetch(nvra) }
-        existing_ids = host.installed_package_ids.to_a
-        unless existing_ids.sort == ids.sort
-          host.sync_package_associations(ids)
-        end
-      end
-      count += 1
-    end
-
-    cleaning_total = sprintf('%.2f', Time.now - cleaning_start)
-    puts "katello_host_installed_packages table has been cleaned, total time was #{cleaning_total} seconds."
-    puts "Removing records from katello_installed_packages that are no longer referenced..."
-    cleaning_start = Time.now
-
-    existing = Katello::HostInstalledPackage.select(:installed_package_id).uniq.pluck(:installed_package_id)
-
-    batch = 20_000
-    until Katello::InstalledPackage.where('id not in (?)', existing).limit(1).count == 0
-      begin
-        deleted = Katello::InstalledPackage.where('id not in (?)', existing).where("id < #{batch}").delete_all
-        sleep(3) if deleted > 0
-        puts "Inspected #{batch} records in katello_host_installed_packages to remove unreferenced entries in katello_installed_packages.."
-      rescue ActiveRecord::InvalidForeignKey
-        puts "Some records in batch #{batch} were unable to be removed. This is usually due to system registrations or updates that occurred after the script started."
-        puts "The script will now exit. Usually, simply re-running the script is sufficient to work through this issue."
-        raise
-      end
-      batch += 20_000
-    end
-    cleaning_total = sprintf('%.2f', Time.now - cleaning_start)
-    puts "katello_installed_packages table has been cleaned to remove unreferenced entries, total time was #{cleaning_total} seconds."
-
-    puts "Script is complete, setting installed package search to updated method. To disable this, set 'bulk query installed packages' to 'false' in Katello settings."
-    Setting[:bulk_query_installed_packages] = true
-    puts "Done!"
-  end
-
-  class PackageCache
-    def initialize
-      @cache = {}
-    end
-
-    def populate
-      Katello::InstalledPackage.select("nvra, MIN(id) as id").group("nvra").each do |pkg|
-        @cache[pkg.nvra] = pkg.id
-      end
-    end
-
-    def fetch(nvra)
-      @cache[nvra] ||= Katello::InstalledPackage.where(:nvra => nvra).first.id
-    end
-  end
-end