katello 3.1.0.rc2.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395d8a31c2395972b2f577bb9355592371adfbcc
-  data.tar.gz: a606dbd1a2f6272f690beb0e88fa3a1557eafddc
+  metadata.gz: bd50631ac9473273192b450d75e6833ef15149f3
+  data.tar.gz: 78315e486ab9b9c86efba125ae3d3ac2a5ea99e9
 SHA512:
-  metadata.gz: 579ca099fa9cf2b6477c8795ccbcdfb37fa2e51bb93975c628a9134191bb9f983d2e6e466af98833213647e62b833c077d7d8000f7e0b0ac89bfe05c706858fe
-  data.tar.gz: 4f018616bf7be9e2fd7ff9243963728757cdd0ecc183409a32fb2e257907dfc0ede3e078da93bf004b3f01660318456e0a2d507bc63e76074d1b328727854ee4
+  metadata.gz: 0f050ea9020c8e7d4403b4c0fc93105fd27d657c57a30f3d9f0da7f394efbe8a992727a2bd9f5246ecc1d939bf54b20d39433820c730b74f4f3b82ca68ba7c63
+  data.tar.gz: aeafb3595411a7032a4461853af5a5ed1f940a5dd9635f9993e3a9cc29ea9baa25c535622a3462cade4c4d66116657ee02eaf773d7ef63627fbc680a7fdd1989

data/app/assets/javascripts/katello/providers/provider_redhat.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-    var spinner = '<i class="icon-spinner inline-icon icon-spin"></i>';
+    var spinner = '<i class="fa fa-spinner fa-spin"></i>';
 
     $("#content_tabs").tabs({
         cache: true,

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

@@ -141,7 +141,7 @@ module Katello
         restrict_hosts = nil
       end
 
-      find_bulk_hosts(:editable, params[:update_hosts], restrict_hosts)
+      find_bulk_hosts(:edit_hosts, params[:update_hosts], restrict_hosts)
     end
 
     def find_content_view_version

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

@@ -18,8 +18,7 @@ module Actions
           end
 
           if host.content_host
-            pool_ids = host.content_host.pools.map { |p| p["id"] }
-            plan_self(:pool_ids => pool_ids)
+            plan_self(:pool_ids => pool_ids(host))
             host.content_host.destroy!
           end
 
@@ -42,6 +41,13 @@ module Actions
           end
         end
 
+        def pool_ids(host)
+          host.content_host.pools.map { |p| p["id"] }
+        rescue RestClient::Gone
+          Rails.logger.warn("Host #{host.name} (#{host.subscription_facet.uuid}) removed from candlepin.")
+          []
+        end
+
         def finalize
           input[:pool_ids].each do |pool_id|
             pool = ::Katello::Pool.where(:cp_id => pool_id).first

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

@@ -58,6 +58,7 @@ module Actions
               consumer_attributes.except(:installedProducts, :guestIds, :facts))
           host.subscription_facet.save!
           host.subscription_facet.update_subscription_status
+          host.content_facet.update_errata_status
           host.refresh_global_status!
 
           system = ::Katello::System.find(input[:system_id])

data/app/lib/actions/pulp/consumer/destroy.rb

@@ -8,6 +8,8 @@ module Actions
 
         def run
           pulp_extensions.consumer.delete(self.input[:uuid])
+        rescue RestClient::ResourceNotFound
+          Rails.logger.error(_("Pulp Consumer %s has already been removed") % input[:uuid])
         end
       end
     end

data/app/mailers/katello/errata_mailer.rb

@@ -4,12 +4,14 @@ module Katello
 
     def host_errata(options)
       user = ::User.find(options[:user])
-      @hosts = ::Host::Managed.authorized("view_hosts").reject do |host|
-        !host.content_facet || host.content_facet.applicable_errata.empty?
-      end
-
-      set_locale_for(user) do
-        mail(:to => user.mail, :subject => _("Host Errata Advisory"))
+      ::User.as(user.login) do
+        @hosts = ::Host::Managed.authorized("view_hosts").reject do |host|
+          !host.content_facet || host.content_facet.applicable_errata.empty?
+        end
+
+        set_locale_for(user) do
+          mail(:to => user.mail, :subject => _("Host Errata Advisory"))
+        end
       end
     end
 
@@ -28,16 +30,17 @@ module Katello
 
     def promote_errata(options)
       user = options[:user]
-
-      @content_view = options[:content_view]
-      @environment = options[:environment]
-      @content_facets = Katello::Host::ContentFacet.where(:lifecycle_environment_id => @environment.id,
-                                                          :content_view_id => @content_view.id)
-      @hosts = ::Host::Managed.authorized("view_hosts").where(:id => @content_facets.pluck(:host_id))
-      @errata = @content_facets.map(&:installable_errata).flatten.uniq
-
-      set_locale_for(user) do
-        mail(:to => user.mail, :subject => (_("Promotion Summary for %{content_view}") % {:content_view => @content_view.name}))
+      ::User.as(user.login) do
+        @content_view = options[:content_view]
+        @environment = options[:environment]
+        @content_facets = Katello::Host::ContentFacet.where(:lifecycle_environment_id => @environment.id,
+                                                            :content_view_id => @content_view.id)
+        @hosts = ::Host::Managed.authorized("view_hosts").where(:id => @content_facets.pluck(:host_id))
+        @errata = @content_facets.map(&:installable_errata).flatten.uniq
+
+        set_locale_for(user) do
+          mail(:to => user.mail, :subject => (_("Promotion Summary for %{content_view}") % {:content_view => @content_view.name}))
+        end
       end
     end
 

data/app/models/katello/erratum.rb

@@ -88,7 +88,7 @@ module Katello
           host_repo_errata.erratum_id = #{Katello::Erratum.table_name}.id").
         where("#{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_errata.repository_id")
 
-      query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => [hosts.map(&:id)]) if hosts
+      query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts.map(&:id)) if hosts
       query.uniq
     end
 

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

@@ -32,7 +32,10 @@ module Katello
       end
 
       def import_pool(cp_pool_id)
-        pool = Katello::Pool.where(:cp_id => cp_pool_id).first_or_create
+        pool = nil
+        ::Katello::Util::Support.active_record_retry do
+          pool = Katello::Pool.where(:cp_id => cp_pool_id).first_or_create
+        end
         pool.import_data
       end
     end
@@ -124,7 +127,7 @@ module Katello
       def create_activation_key_associations
         keys = Resources::Candlepin::ActivationKey.get(nil, "?include=id&include=pools.pool.id")
         activation_key_ids = keys.collect do |key|
-          key['id'] if key['pools'].present? && key['pools'].any? { |pool| pool['pool']['id'] == cp_id }
+          key['id'] if key['pools'].present? && key['pools'].any? { |pool| pool['pool'].try(:[], 'id') == cp_id }
         end
         related_keys = ::Katello::ActivationKey.where(:cp_id => activation_key_ids.compact)
         related_keys.each do |key|

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

@@ -139,13 +139,13 @@ module Katello
       end
 
       def import_subscription(subscription_id)
-        sub = ::Katello::Subscription.where(:cp_id => subscription_id).first_or_create
+        sub = nil
+        ::Katello::Util::Support.active_record_retry do
+          sub = ::Katello::Subscription.where(:cp_id => subscription_id).first_or_create
+        end
         sub.import_data
         pools = ::Katello::Resources::Candlepin::Product.pools(self.organization.label, self.cp_id)
-        pools.each do |pool_json|
-          pool = ::Katello::Pool.where(:cp_id => pool_json['id']).first_or_create
-          pool.import_data
-        end
+        pools.each { |pool_json| ::Katello::Pool.import_pool(pool_json['id']) }
       end
 
       protected

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

@@ -21,7 +21,7 @@ module Katello
       end
 
       def query_products
-        self.backend_data["providedProducts"]
+        self.backend_data["providedProducts"] + self.backend_data["derivedProvidedProducts"]
       end
 
       def import_data

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

@@ -181,24 +181,25 @@ module Katello
       def importer_ssl_options(capsule = nil)
         if capsule
           ueber_cert = ::Cert::Certs.ueber_cert(organization)
-          {
+          importer_options = {
             :ssl_client_cert => ueber_cert[:cert],
             :ssl_client_key => ueber_cert[:key],
             :ssl_ca_cert => ::Cert::Certs.ca_cert
           }
-        elsif redhat? && self.content_view.default?
-          {
+        elsif self.try(:redhat?) && self.content_view.default?
+          importer_options = {
             :ssl_client_cert => self.product.certificate,
             :ssl_client_key => self.product.key,
             :ssl_ca_cert => Resources::CDN::CdnResource.ca_file_contents
           }
         else
-          {
+          importer_options = {
             :ssl_client_cert => nil,
             :ssl_client_key => nil,
             :ssl_ca_cert => nil
           }
         end
+        importer_options
       end
 
       def generate_distributors(capsule = false)

data/app/models/katello/host/subscription_facet.rb

@@ -99,7 +99,7 @@ module Katello
       end
 
       def self.find_host(name, organization)
-        hosts = ::Host.where(:name => name)
+        hosts = ::Host.where(:name => name.downcase)
         return nil if hosts.empty? #no host exists
         if hosts.where("organization_id = #{organization.id} OR organization_id is NULL").empty? #not in the correct org
           #TODO: http://projects.theforeman.org/issues/11532

data/app/models/katello/host_collection.rb

@@ -27,7 +27,7 @@ module Katello
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
-    scoped_search :in => :hosts, :complete_value => false
+    scoped_search :in => :hosts, :on => :name, :rename => :host, :complete_value => true
 
     def max_hosts_check
       if !unlimited_hosts && (hosts.length > 0 && (hosts.length.to_i > max_hosts.to_i)) && max_hosts_changed?

data/app/models/katello/repository.rb

@@ -37,21 +37,21 @@ module Katello
                                          :dependent => :destroy, :inverse_of => :repository
     has_many :content_views, :through => :content_view_repositories
 
-    has_many :repository_errata, :class_name => "Katello::RepositoryErratum", :dependent => :destroy
+    has_many :repository_errata, :class_name => "Katello::RepositoryErratum", :dependent => :delete_all
     has_many :errata, :through => :repository_errata
 
-    has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :destroy
+    has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :delete_all
     has_many :rpms, :through => :repository_rpms
 
-    has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :destroy
+    has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :delete_all
     has_many :puppet_modules, :through => :repository_puppet_modules
 
-    has_many :repository_docker_manifests, :class_name => "Katello::RepositoryDockerManifest", :dependent => :destroy
+    has_many :repository_docker_manifests, :class_name => "Katello::RepositoryDockerManifest", :dependent => :delete_all
     has_many :docker_manifests, :through => :repository_docker_manifests
 
     has_many :docker_tags, :dependent => :destroy, :class_name => "Katello::DockerTag"
 
-    has_many :repository_ostree_branches, :class_name => "Katello::RepositoryOstreeBranch", :dependent => :destroy
+    has_many :repository_ostree_branches, :class_name => "Katello::RepositoryOstreeBranch", :dependent => :delete_all
     has_many :ostree_branches, :through => :repository_ostree_branches
 
     has_many :system_repositories, :class_name => "Katello::SystemRepository", :dependent => :destroy
@@ -60,7 +60,7 @@ module Katello
     has_many :content_facet_repositories, :class_name => "Katello::ContentFacetRepository", :dependent => :destroy
     has_many :content_facets, :through => :content_facet_repositories
 
-    has_many :repository_package_groups, :class_name => "Katello::RepositoryPackageGroup", :dependent => :destroy
+    has_many :repository_package_groups, :class_name => "Katello::RepositoryPackageGroup", :dependent => :delete_all
     has_many :package_groups, :through => :repository_package_groups
 
     has_many :kickstart_content_facets, :class_name => "Katello::Host::ContentFacet", :foreign_key => :kickstart_repository_id,

data/app/services/katello/candlepin/consumer.rb

@@ -120,6 +120,15 @@ module Katello
         end
       end
 
+      def self.orphaned_consumer_ids
+        #returns consumer ids in candlepin with no matching katello entry
+        cp_consumers = ::Katello::Resources::Candlepin::Consumer.get({})
+        cp_consumers.reject! { |consumer| consumer['type']['label'] == 'uebercert' }
+        cp_consumer_ids = cp_consumers.map { |cons| cons["uuid"] }
+        katello_consumer_ids = ::Katello::Host::SubscriptionFacet.pluck(:uuid)
+        cp_consumer_ids - katello_consumer_ids
+      end
+
       def self.distribution_to_puppet_os(name)
         return ::Operatingsystem::REDHAT_ATOMIC_HOST_OS if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_DISTRO_NAME
 

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -337,13 +337,16 @@ class MigrateContentHosts < ActiveRecord::Migration
     end
 
     User.current = User.anonymous_api_admin
+    system_count = ::MigrateContentHosts::System.all.count
+
+    return true if system_count == 0
 
     ping = ::Katello::Ping.ping
     if ping[:status] != ::Katello::Ping::OK_RETURN_CODE
       fail _("Some backend services are not running: %s") % ping.inspect
     end
 
-    ::Katello::System.where(:uuid => nil).destroy_all
+    ::MigrateContentHosts::System.where(:uuid => nil).destroy_all
 
     ensure_one_system_per_hostname(MigrateContentHosts::System.where("type != '#{HYPERVISOR_CLASS}'").all)
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js

@@ -158,7 +158,7 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
             var repositoryIds = $scope.contentView['repository_ids'],
                 promise;
 
-            promise = Package.autocompleteName({repoids: repositoryIds, term: term}).$promise;
+            promise = Package.autocompleteName({'repoids[]': repositoryIds, term: term}).$promise;
 
             return promise.then(function (data) {
                 return data.results;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tags-details.html

@@ -1,7 +1,7 @@
 <span page-title ng-model="tag">{{ 'Docker Tag: ' | translate }} {{ tag.full_name }}</span>
 
 <div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="icon-spinner icon-spin"></i>
+  <i class="fa fa-spinner fa-spin"></i>
   {{ "Loading..." | translate }}
 </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata.html

@@ -20,7 +20,7 @@
     </div>
 
     <div class="alert alert-info" ng-show="state.working">
-      <i class="icon-spinner inline-icon icon-spin"></i>
+      <i class="fa fa-spinner fa-spin"></i>
       {{ 'Processing' | translate }}
     </div>
 

data/lib/katello/engine.rb

@@ -254,7 +254,7 @@ module Katello
       load "#{Katello::Engine.root}/lib/katello/tasks/setup.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/delete_orphaned_content.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/regenerate_repo_metadata.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/reindex.rake"
+      load "#{Katello::Engine.root}/lib/katello/tasks/reimport.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/rubocop.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/clean_backend_objects.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrade_check.rake"

data/lib/katello/tasks/clean_backend_objects.rake

@@ -1,22 +1,30 @@
 namespace :katello do
-  desc "Cleans backend objects (systems) that are missing in one or more backend systems"
-  task :clean_backend_objects => ["environment"] do
-    def cleanup_systems
-      Katello::System.find_each do |system|
-        if system.uuid.nil?
-          cp_fail = true
-          pulp_fail = true
-        else
-          cp_fail = test_method { system.facts }
-          pulp_fail = test_method { system.pulp_facts } unless system.is_a?(Katello::Hypervisor)
+  desc "Cleans backend objects (hosts) that are missing in one or more backend systems.  Run with COMMIT=true to commit changes."
+  task :clean_backend_objects => ["environment", "check_ping"] do
+    def cleanup_hosts
+      Host.includes(:content_facet, :subscription_facet).find_each do |host|
+        if test_candlepin(host) || test_pulp(host)
+          print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing.  Un-registering\n"
+          execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
         end
+      end
+    end
 
-        if cp_fail || pulp_fail
-          print "System #{system.id} #{system.name} #{system.uuid} is partially missing.  Cleaning.\n"
-          ::Katello::Resources::Candlepin::Consumer.destroy(system.uuid) unless cp_fail
-          system.del_pulp_consumer unless (pulp_fail || system.is_a?(Katello::Hypervisor))
-          system.destroy!
-        end
+    def test_pulp(host)
+      if host.content_facet.try(:uuid)
+        test_method { Katello.pulp_server.extensions.consumer.retrieve(host.content_facet.uuid) }
+      else
+        test_method { false }
+      end
+    end
+
+    def test_candlepin(host)
+      if host.subscription_facet && host.subscription_facet.uuid
+        test_method { ::Katello::Resources::Candlepin::Consumer.get(host.subscription_facet.uuid) }
+      elsif host.subscription_facet
+        test_method { true }
+      else
+        test_method { false }
       end
     end
 
@@ -31,40 +39,32 @@ namespace :katello do
       true
     end
 
-    def cleanup_host_delete_artifacts
-      # clean up dirty consumer data in candleplin,
-      # that did not get cleared by host delete.
-      # look at https://bugzilla.redhat.com/show_bug.cgi?id=1140653
-      # for more information
-      cp_consumers = ::Katello::Resources::Candlepin::Consumer.get({})
-      cp_consumers.reject! { |consumer| consumer['type']['label'] == 'uebercert' }
-      cp_consumer_ids = cp_consumers.map { |cons| cons["uuid"] }
-      katello_consumer_ids = ::Katello::System.pluck(:uuid)
-      deletable_ids = cp_consumer_ids - katello_consumer_ids
-      deletable_ids.each do |consumer_id|
-        begin
-          Katello::Resources::Candlepin::Consumer.destroy(consumer_id)
-        rescue RestClient::Exception => e
-          p "exception when destroying candlepin consumer #{consumer_id}:#{e.inspect}"
-        end
-        begin
-          Katello.pulp_server.extensions.consumer.delete(consumer_id)
-        rescue RestClient::ResourceNotFound # rubocop:disable Lint/HandleExceptions
-          #do nothing
-        rescue RestClient::Exception => e
-          p "exception when destroying pulp consumer #{consumer_id}:#{e.inspect}"
-        end
+    # rubocop:disable HandleExceptions
+    def execute(error_msg)
+      if ENV['COMMIT'] == 'true'
+        yield
+      end
+    rescue RestClient::ResourceNotFound
+    rescue => e
+      print error_msg
+      print e.inspect
+    end
+
+    def clean_backend_orphans
+      consumer_ids = Katello::Candlepin::Consumer.orphaned_consumer_ids
+      print "#{consumer_ids.count} orphaned consumer id(s) found.\n"
+      consumer_ids.each do |consumer_id|
+        execute("exception when destroying candlepin consumer #{consumer_id}") { Katello::Resources::Candlepin::Consumer.destroy(consumer_id) }
+        execute("exception when destroying pulp consumer #{consumer_id}") { Katello.pulp_server.extensions.consumer.delete(consumer_id) }
       end
     end
 
-    # check services first
-    result = ::Katello::Ping.ping
-    if result[:status] != ::Katello::Ping::OK_RETURN_CODE
-      fail "Could not connect to service: #{result[:message]}"
+    unless ENV['COMMIT'] == 'true'
+      print "The following changes will not actually be performed.  Rerun with COMMIT=true to apply the changes\n"
     end
 
     User.current = User.anonymous_admin
-    cleanup_systems
-    cleanup_host_delete_artifacts
+    cleanup_hosts
+    clean_backend_orphans
   end
 end

data/lib/katello/tasks/reimport.rake

@@ -0,0 +1,43 @@
+namespace :katello do
+  desc "Runs a katello ping and prints out the statuses of each service"
+  task :check_ping do
+    User.current = User.anonymous_admin
+    ping_results = Katello::Ping.ping
+    if ping_results[:status] != "ok"
+      pp ping_results
+      fail("Not all the services have been started. Check the status report above and try again.")
+    end
+  end
+
+  desc "Reimports information from backend systems"
+  task :reimport => ["environment", "katello:check_ping"] do
+    User.current = User.anonymous_admin #set a user for orchestration
+
+    Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
+
+    models = [Katello::Erratum,
+              Katello::PackageGroup,
+              Katello::PuppetModule,
+              Katello::Rpm,
+              Katello::Subscription,
+              Katello::Pool]
+
+    models << Katello::OstreeBranch if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
+
+    models.each do |model|
+      print "Importing #{model.name}\n"
+      model.import_all
+    end
+
+    print "Importing Activation Key Subscriptions\n"
+    Katello::ActivationKey.all.each do |ack_key|
+      ack_key.import_pools
+    end
+
+    print "Importing Docker Content\n"
+    # For docker repositories, index all associated manifests and tags
+    Katello::Repository.docker_type.each do |docker_repo|
+      docker_repo.index_db_docker_manifests
+    end
+  end
+end

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

@@ -2,29 +2,65 @@ 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.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!
 
-            Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
-          rescue RestClient::Exception => exception
-            Rails.logger.error exception
-          end
-        end
+            host = subscription_facet.host
+            if host.name.include?('_') || host.name != host.name.downcase
+              host.name = host.name.gsub('_', '-').downcase
+              host.save!
+            end
 
-        #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)
+            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
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.1.0.rc2.1".freeze
+  VERSION = "3.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc2.1
+  version: 3.1.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +111,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: qpid_messaging
   requirement: !ruby/object:Gem::Requirement
@@ -208,16 +214,16 @@ dependencies:
   name: bastion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -1187,7 +1193,6 @@ files:
 - config/initializers/rabl_init.rb
 - config/initializers/runcible.rb
 - config/katello.yaml.example
-- config/katello.yml
 - config/locales/README
 - config/locales/bn.yml
 - config/locales/compare_upstream.sh
@@ -1838,7 +1843,7 @@ files:
 - lib/katello/tasks/jsroutes.rake
 - lib/katello/tasks/pretty_routes.rake
 - lib/katello/tasks/regenerate_repo_metadata.rake
-- lib/katello/tasks/reindex.rake
+- lib/katello/tasks/reimport.rake
 - lib/katello/tasks/rubocop.rake
 - lib/katello/tasks/setup.rake
 - lib/katello/tasks/simplecov.rake
@@ -1962,12 +1967,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ''

data/config/katello.yml

@@ -1,49 +0,0 @@
-#
-# WARNING: THIS CONFIGURATION WAS GENERATED BY KATELLO-CONFIGURE TOOL,
-# CHANGES WILL LIKELY BE OVERWRITTEN. IF YOU WISH TO PRESERVE ANY CHANGES
-# TO THIS FILE PLEASE EDIT /usr/share/katello/install/default-answer-file
-# FOR THE CORRESPONDING OPTION AND RERUN katello-configure.
-#
-
-# Katello configuration
-#
-# :vim:sw=2:ts=2:et:
-
-# see /usr/share/katello/config.katello_defaults.yml for available options
-
-:katello:
-
-  :rest_client_timeout: 120
-
-  :post_sync_url: https://robot.example.com/katello/api/v2/repositories/sync_complete?token=test
-
-  :candlepin:
-    :url: https://robot.example.com:8443/candlepin
-    :oauth_key: katello
-    :oauth_secret: katello
-
-  :pulp:
-    :url: https://robot.example.com/pulp/api/v2/
-    :oauth_key: katello
-    :oauth_secret: katello
-
-  :qpid:
-    :url: amqp:ssl:robot.example.com:5671
-    :subscriptions_queue_address: katello_event_queue
-
-  :loggers:
-    :glue:
-      :enabled: false
-    :pulp_rest:
-      :enabled: false
-    :cp_rest:
-      :enabled: false
-    :cp_proxy:
-      :enabled: false
-    :action:
-      :enabled: false
-    :tire_rest:
-      :enabled: false
-    :manifest_import_logger:
-      :enabled: false
-

data/lib/katello/tasks/reindex.rake

@@ -1,157 +0,0 @@
-namespace :katello do
-  class ReindexHelper
-    LOG_FILE = "#{Rails.root}/log/reindex.log".freeze
-
-    attr_accessor :reindex_logger
-
-    def reindex_logger
-      unless @reindex_logger
-        @reindex_logger = Logger.new(LOG_FILE)
-        @reindex_logger.formatter = Logger::Formatter.new
-        @reindex_logger.level = Logger::DEBUG
-      end
-      @reindex_logger
-    end
-
-    def log(message, options = {})
-      puts message if options[:console]
-      if options[:error]
-        reindex_logger.error(message)
-      else
-        reindex_logger.info("#{message}")
-      end
-    end
-
-    def log_error(message)
-      log(message, :error => true)
-    end
-
-    def fetch_resource
-      return yield
-    rescue RestClient::ResourceNotFound, RestClient::BadRequest => _ # rubocop:disable Lint/HandleExceptions
-      # ignore
-    end
-
-    def index_objects(object_class)
-      log("Re-indexing #{object_class.name}", :console => true)
-      begin
-        yield
-      rescue => _
-        if object_class.ancestors.include?(Katello::Glue::Pulp::PulpContentUnit)
-          report_bad_backend_class(object_class.name)
-        else
-          bad_objects = []
-          object_class.each do |object|
-            begin
-              object.update_index
-            rescue => e
-              bad_objects << [object, e]
-            end
-          end
-          report_bad_objects(bad_objects, object_class.name)
-        end
-      end
-    end
-
-    def report_bad_objects(bad_objects_exception_hash, model_name)
-      User.current = User.anonymous_admin
-      log("The following #{model_name} items could not be indexed due to various reasons.", :console => true)
-      log("Please check #{ReindexHelper::LOG_FILE} for more detailed information.", :console => true)
-
-      bad_objects_exception_hash.each do |object, exception|
-        log("Object: #{object.inspect}", :console => true)
-        log_error("Exception: #{exception.message}")
-        if object.is_a? Katello::Repository
-          notes = []
-          notes << "Pulp Repository #{object.pulp_id} was not found." if object.pulp_repo_facts.nil?
-          if object.content_id
-            content = fetch_resource { object.content }
-            notes << "Candlepin Content was not available for #{object.name}." if content.nil?
-          end
-          log_error "Notes:\n #{notes.join("\n")}" unless notes.empty?
-        elsif object.is_a? Katello::System
-          notes = []
-          facts = fetch_resource { object.pulp_facts }
-          notes << "Pulp Consumer #{object.uuid} was not found." if facts.nil?
-          candlepin_consumer_info = fetch_resource { Katello::Resources::Candlepin::Consumer.get(object.uuid) }
-          notes << "Candlepin Consumer was not available for #{object.name}." if candlepin_consumer_info.nil?
-          notes << "Foreman Host was not available for #{object.name}." if object.foreman_host.nil?
-
-          log_error "Notes:\n #{notes.join("\n")}" unless notes.empty?
-        end
-        log_error "Stack Trace: \n #{exception.backtrace.join("\n")}"
-      end
-    end
-  end
-
-  def report_bad_backend_class(model_name)
-    log("The following #{model_name} items could not be indexed due to various reasons.", :console => true)
-    log("Please check #{ReindexHelper::LOG_FILE} for more detailed information.", :console => true)
-    log_error("Exception: #{exception.message}")
-    log_error "Stack Trace: \n #{exception.backtrace.join("\n")}"
-  end
-
-  desc "Runs a katello ping and prints out the statuses of each service"
-  task :check_ping do
-    User.current = User.anonymous_admin
-    ping_results = Katello::Ping.ping
-    if ping_results[:status] != "ok"
-      pp ping_results
-      fail("Not all the services have been started. Check the status report above and try again.")
-    end
-  end
-
-  desc "Regenerates the search indicies for various Katello objects"
-  task :reindex => ["environment", "katello:check_ping"] do
-    User.current = User.anonymous_admin #set a user for orchestration
-
-    Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
-    reindex_helper = ReindexHelper.new
-
-    Katello::Util::Search.active_record_search_classes.each do |model|
-      reindex_helper.log("Re-indexing #{model.name}", :console => true)
-      sub_classes = model.subclasses
-
-      if sub_classes.empty? || !model.column_names.include?('type')
-        objects = model.all
-      else
-        #Index STI subclasses separately
-        objects = model.where(:type => [nil, model.name])
-      end
-
-      begin
-        model.index.import(objects) if objects.count > 0
-      rescue => e
-        bad_objects = []
-        objects.each do |object|
-          begin
-            object.update_index
-          rescue => e
-            bad_objects << [object, e]
-          end
-        end
-        reindex_helper.report_bad_objects(bad_objects, model.name)
-      end
-    end
-
-    Katello::Erratum.import_all
-    Katello::PackageGroup.import_all
-    Katello::PuppetModule.import_all
-    Katello::OstreeBranch.import_all if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
-    Katello::Subscription.import_all
-    Katello::Pool.import_all
-
-    Katello::ActivationKey.all.each do |ack_key|
-      ack_key.import_pools
-    end
-
-    reindex_helper.index_objects(Katello::Rpm) do
-      Katello::Rpm.import_all
-    end
-
-    # For docker repositories, index all associated manifests and tags
-    Katello::Repository.docker_type.each do |docker_repo|
-      docker_repo.index_db_docker_manifests
-    end
-  end
-end