katello 4.0.0.rc2 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 336a4ba95971459cc367612026947e16d536f4002aa4edbbf1ef2f5c75fc8d79
-  data.tar.gz: bf25590898a3e0485037acb025c7d654c3a98dce1dfb2830f85db8923eb78bdd
+  metadata.gz: 25c755b23475d0447099ee99388c1d900ae9815b1e4be88ab5d13afeb7d044d2
+  data.tar.gz: 4482488f5ff9186dfe7f7db25901b2afa00b979c2fbf926ccfc329983a122661
 SHA512:
-  metadata.gz: 19244df2d07a33451ae52bf787b7cd5d173db7647a90b88535077e27266a14814315d7b31f124c66cad14a41eb27bdbb8e78a2fe06b900b3f931f833b89b89c6
-  data.tar.gz: 753d1c2598e96cdf3ce57c79abe0f997733ea296c29f5ccedafd0502530046a727be430ae87b3d4b3030415f66c9d7801f8222dca6e388c576ca6ad46766cd9b
+  metadata.gz: 464106f37ffb3915d1029ea95f9ecdc8d6c985fde7d0a40826dc111aefb1e621c17a79d478ef6538be9f485c35fec13cc1af6ad47a3b30485183a381af71828a
+  data.tar.gz: 1da0019879786addea556e156ae5b187df06170a0718eff50580d4e9bb8579b9c897fd7729c893bf414068d89813a5f9614d799e7b0584852c6c890ffac8660e

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

@@ -29,7 +29,7 @@ module Katello
 
     api :GET, "/content_exports/api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
     def api_status
-      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in a future version of Katello.")
+      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in Katello 4.1.")
       render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
     end
 

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

@@ -9,7 +9,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("uuid of the puppet module"), :deprecated => true
+    param :uuid, String, :desc => N_("uuid of the puppet module")
     param_group :search, ::Katello::Api::V2::ApiController
     add_scoped_search_description_for(ContentViewPuppetModule)
     def index
@@ -22,7 +22,7 @@ module Katello
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :id, String, :desc => N_("the id of the puppet module to associate")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def create
       params[:content_view_puppet_module][:uuid] ||= PuppetModule.find(params[:id]).try(:pulp_id) if params[:id]
       respond resource: ContentViewPuppetModule.create!(puppet_module_params.merge(content_view: @view))
@@ -41,7 +41,7 @@ module Katello
     param :id, :number, :desc => N_("puppet module ID"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def update
       @puppet_module.update!(puppet_module_params)
       respond :resource => @puppet_module

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

@@ -95,7 +95,7 @@ module Katello
         fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
                                        "Use hammer content-export for Yum repositories")
       end
-      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
+      ::Foreman::Deprecation.api_deprecation_warning("Pulp 2 export is deprecated and will not work as of Katello 4.0. To export using Pulp 3, use hammer content-export version.")
       if params[:export_to_iso].blank? && params[:iso_mb_size].present?
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end

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

@@ -62,7 +62,7 @@ module Katello
       collection
     end
 
-    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update"), :deprecated => true
+    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."), :deprecated => true
     param :id, :number, :desc => N_("Content View Version identifier"), :required => true
     param :organization_id, :number, :desc => N_("Organization identifier")
     param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")

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

@@ -51,7 +51,7 @@ module Katello
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
     param :host_id, :number, :desc => N_("Host ID"), :required => true
-    param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => false, :deprecated => true
+    param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
 
     param_group :bulk_errata_ids
     def apply

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

@@ -22,7 +22,6 @@ module Katello
         param :smart_proxy_ids, Array, N_("Smart proxy IDs"), :required => false
         param :compute_resource_ids, Array, N_("Compute resource IDs"), :required => false
         param :medium_ids, Array, N_("Medium IDs"), :required => false
-        param :config_template_ids, Array, N_("Provisioning template IDs"), :required => false # FIXME: deprecated
         param :ptable_ids, Array, N_("Partition template IDs"), :required => false
         param :provisioning_template_ids, Array, N_("Provisioning template IDs"), :required => false
         param :domain_ids, Array, N_("Domain IDs"), :required => false

data/app/controllers/katello/concerns/api/v2/authorization.rb

@@ -39,7 +39,20 @@ module Katello
       end
 
       def throw_resource_not_found(name: resource_name, id: params[:id])
-        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}") % {id: id, name: name}
+        perms_message = "Potential missing permissions: " +
+          missing_permissions.map(&:name).join(', ')
+        fail HttpErrors::NotFound, _("Could not find %{name} resource with id %{id}. %{perms_message}") % {id: id, name: name, perms_message: perms_message}
+      end
+
+      def missing_permissions
+        missing_perms = ::Foreman::AccessControl.permissions_for_controller_action(path_to_authenticate)
+
+        # promote_or_remove_content_views_to_environments has a special relationship to promote_or_remove_content_views
+        if path_to_authenticate["controller"] == "katello/api/v2/content_view_versions" &&
+            path_to_authenticate["action"].in?(["promote", "remove_from_environment", "remove", "republish_repositories"])
+          missing_perms << ::Permission.find_by(name: "promote_or_remove_content_views_to_environments")
+        end
+        missing_perms
       end
 
       def throw_resources_not_found(name:, expected_ids: [])

data/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb

@@ -26,8 +26,7 @@ module Katello
         before_action :find_resource_and_status, :only => [:pulp_storage, :pulp_status]
 
         def pulp_storage
-          pulp_connection = @proxy_status[:pulp] || @proxy_status[:pulpnode]
-          @storage = pulp_connection.storage
+          @storage = @smart_proxy.pulp_disk_usage
           respond_to do |format|
             format.html { render :layout => false }
             format.json { render :json => {:success => true, :message => @storage} }

data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb

@@ -2,20 +2,21 @@ module Katello
   module Concerns
     module SmartProxyHelperExtensions
       def disks(storage)
-        mount_points = {}
-        disks = []
-        storage.each_value do |values|
-          mount = values['mounted']
-          mount_points[mount].nil? ? mount_points[mount] = [values['path']] : mount_points[mount] << values['path']
-          values['header'] = "#{mount_points[mount].to_sentence} (on #{values['filesystem']})"
-          values['available_percent'] = available_percent(values['percent'])
-          values['size_status'] = storage_warning(values['available'])
-          values['total'] = kb_to_actual(values.delete('1k-blocks'))
-          values['used'] = kb_to_actual(values['used'])
-          values['available'] = kb_to_actual(values['available'])
-          disks << values
+        storage.map do |values|
+          values['header'] = values['description']
+          values['available_percent'] = 100 - values['percentage']
+          values['size_status'] = storage_warning(values['free'])
+          values
+        end
+      end
+
+      def humanize_bytes(bytes)
+        mb = bytes / 1024 / 1024
+        if mb < 1000
+          "#{mb} MB"
+        else
+          "#{mb / 1024} GB"
         end
-        disks.group_by { |h| h['mounted'] }.map { |_, hs| hs.reduce(:merge) }
       end
 
       def boolean_to_icon(boolean)
@@ -24,12 +25,6 @@ module Katello
         icon_text(icon, '', :kind => 'pficon')
       end
 
-      def available_percent(percent_string)
-        used_percent = percent_string.delete('%').to_i
-        available_percent = 100 - used_percent
-        "#{available_percent}%"
-      end
-
       def download_policies
         policies = [
           {
@@ -54,7 +49,7 @@ module Katello
       end
 
       def storage_warning(available)
-        gb_size = available.to_i / 1_048_576
+        gb_size = available.to_i / 1_073_741_824
         case gb_size
         when 0..1
           "danger"

data/app/lib/actions/pulp3/content_migration_reset.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Pulp3
+    class ContentMigrationReset < Pulp3::AbstractAsyncTask
+      def plan(smart_proxy)
+        plan_self(smart_proxy_id: smart_proxy.id)
+      end
+
+      def invoke_external_task
+        migration_service = ::Katello::Pulp3::Migration.new(smart_proxy)
+        migration_service.reset
+      end
+
+      def humanized_name
+        _("Content Migration Reset")
+      end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Skip
+      end
+    end
+  end
+end

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -129,13 +129,14 @@ module Katello
             seen_errata_ids = (seen_errata_ids + parse_errata(task)).uniq
             seen_host_ids << task.input['host']['id'].to_i if include_last_reboot == 'yes'
           end
+          seen_host_ids &= only_host_ids if only_host_ids
 
           # preload errata in one query for this batch
           preloaded_errata = Katello::Erratum.where(:errata_id => seen_errata_ids).pluck(:errata_id, :errata_type)
-          preloaded_hosts = ::Host.where(:id => seen_host_ids & only_host_ids).includes(:reported_data)
+          preloaded_hosts = ::Host.where(:id => seen_host_ids).includes(:reported_data)
 
           batch.each do |task|
-            next unless only_host_ids.include?(task.input['host']['id'].to_i)
+            next if !only_host_ids.nil? && only_host_ids.include?(task.input['host']['id'].to_i)
             parse_errata(task).each do |erratum_id|
               current_erratum_errata_type = preloaded_errata.find { |k, _| k == erratum_id }.last
 

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

@@ -153,6 +153,34 @@ module Katello
         end
       end
 
+      def pulp_disk_usage
+        if has_feature?(PULP_FEATURE) || has_feature?(PULP_NODE_FEATURE)
+          status = self.statuses[:pulp] || self.statuses[:pulpnode]
+          status&.storage&.map do |label, results|
+            {
+              description: results['path'],
+              total: results['1k-blocks'] * 1024,
+              used: results['used'] * 1024,
+              free: results['available'] * 1024,
+              percentage: (results['used'] / results['1k-blocks'].to_f * 100).to_i,
+              label: label
+            }.with_indifferent_access
+          end
+        elsif pulp3_enabled?
+          storage = ping_pulp3['storage']
+          [
+            {
+              description: 'Pulp Storage (/var/lib/pulp by default)',
+              total: storage['total'],
+              used: storage['used'],
+              free: storage['free'],
+              percentage: (storage['used'] / storage['total'].to_f * 100).to_i,
+              label: 'pulp_dir'
+            }.with_indifferent_access
+          ]
+        end
+      end
+
       def backend_service_type(repository)
         if pulp3_support?(repository)
           Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE

data/app/models/katello/content_view_version_export_history.rb

@@ -8,13 +8,14 @@ module Katello
 
     belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion", :inverse_of => :export_histories
     validates_lengths_from_database
+
     validates :content_view_version_id, :presence => true
     validates :destination_server, :uniqueness => { :scope => [:content_view_version_id, :destination_server, :path] }
-    validates :export_type, :inclusion => { :in => EXPORT_TYPES,
-                                            :allow_blank => false,
-                                            :message => _("Invalid export_type from one of the following: %s" % EXPORT_TYPES.join(', '))
-                                          }
-
+    validates :export_type, :presence => true,
+              :inclusion => { :in => EXPORT_TYPES,
+                              :allow_blank => false,
+                              :message => _("must be one of the following: %s" % EXPORT_TYPES.join(', '))
+                            }
     validates :metadata, :presence => true
     serialize :metadata, Hash
 
@@ -39,7 +40,7 @@ module Katello
     end
 
     def export_type_from_metadata
-      cvve.metadata[:incremental] ? INCREMENTAL : COMPLETE
+      metadata[:incremental] ? INCREMENTAL : COMPLETE
     end
 
     def set_export_type

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

@@ -31,43 +31,21 @@ module Katello
       validates :host, :presence => true, :allow_blank => false
       validates_with Validators::ContentViewEnvironmentValidator
 
-      def bindable_types
-        [
-          {
-            type: Repository::DEB_TYPE,
-            matcher: '/pulp/deb/',
-            paths: []
-          },
-          {
-            type: Repository::YUM_TYPE,
-            matcher: '/pulp/repos/',
-            paths: []
-          }
-        ]
-      end
-
       def update_repositories_by_paths(paths)
-        bindable_paths = bindable_types
+        prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
 
-        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2",
-        # "/pulp/repos/Default_Organization/Library/custom/Test_product/My_repo"]
-        paths.each do |absolute_path|
-          bindable_paths.each do |supported|
-            relative_path = absolute_path.gsub(supported[:matcher], '') # remove e.g. '/pulp/repos/' from beginning of string
-            relative_paths << relative_path unless relative_path == absolute_path
-            if absolute_path.starts_with?(supported[:matcher])
-              supported[:paths] << relative_path
-              break
-            end
+        # paths == ["/pulp/repos/Default_Organization/Library/custom/Test_product/test2"]
+        paths.each do |path|
+          if (prefix = prefixes.find { |pre| path.start_with?(pre) })
+            relative_paths << path.gsub(prefix, '')
+          else
+            Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to repo with unknown prefix. #{path}")
           end
         end
 
-        repos = bindable_paths.flat_map do |supported|
-          repos = Repository.joins(:root).where(RootRepository.table_name => {content_type: supported[:type]}, relative_path: supported[:paths])
-          relative_paths -= repos.pluck(:relative_path) # remove relative paths that match our repos
-          repos
-        end
+        repos = Repository.where(relative_path: relative_paths)
+        relative_paths -= repos.pluck(:relative_path) # remove relative paths that match our repos
 
         # Any leftover relative paths do not match the repos we've just retrieved from the db,
         # so we should log warnings about them.

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

@@ -6,8 +6,6 @@ module Katello
       def host_info
         info = {}
         info['parameters'] = {
-          'kt_env' => host.lifecycle_environment.try(:label), #deprecated
-          'kt_cv' => host.content_view.try(:label), #deprecated
           'foreman_host_collections' => host.host_collections.map(&:name),
           'lifecycle_environment' => host.lifecycle_environment.try(:label),
 

data/app/models/katello/ping.rb

@@ -9,7 +9,7 @@ module Katello
         SETTINGS[:katello][:use_pulp_2_for_content_type].nil? || (!SETTINGS[:katello][:use_pulp_2_for_content_type][:yum] &&
         !SETTINGS[:katello][:use_pulp_2_for_content_type][:docker] &&
         !SETTINGS[:katello][:use_pulp_2_for_content_type][:file]) ||
-        system('systemctl is-enabled pulpcore-api.service')
+        system('systemctl is-enabled pulpcore-api.service &>/dev/null')
       end
 
       def services(capsule_id = nil)
@@ -23,26 +23,18 @@ module Katello
         services
       end
 
-      # Calls "status" services in all backend engines.
       def ping(services: nil, capsule_id: nil)
-        services ||= self.services(capsule_id)
-        result = {}
-        services.each { |service| result[service] = {} }
+        ping_services_for_capsule(services, capsule_id)
+      end
 
-        ping_pulp3_without_auth(result[:pulp3], capsule_id) if result.include?(:pulp3)
-        ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
-        ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)
+      def ping!(services: nil, capsule_id: nil)
+        result = ping_services_for_capsule(services, capsule_id)
 
-        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status]) if result.include?(:pulp_auth)
-        ping_candlepin_with_auth(result[:candlepin_auth]) if result.include?(:candlepin_auth)
-        ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
-        ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
-        ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
-        ping_katello_agent(result[:katello_agent]) if result.include?(:katello_agent)
+        if result[:status] != OK_RETURN_CODE
+          failed_names = failed_services(result).keys
+          fail("The following services have not been started or are reporting errors: #{failed_names.join(', ')}")
+        end
 
-        # set overall status result code
-        result = {:services => result}
-        result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
         result
       end
 
@@ -229,6 +221,34 @@ module Katello
 
       private
 
+      def failed_services(result)
+        result[:services].reject do |_name, details|
+          details[:status] != OK_RETURN_CODE
+        end
+      end
+
+      def ping_services_for_capsule(services, capsule_id)
+        services ||= self.services(capsule_id)
+        result = {}
+        services.each { |service| result[service] = {} }
+
+        ping_pulp3_without_auth(result[:pulp3], capsule_id) if result.include?(:pulp3)
+        ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
+        ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)
+
+        ping_pulp_with_auth(result[:pulp_auth], result[:pulp][:status]) if result.include?(:pulp_auth)
+        ping_candlepin_with_auth(result[:candlepin_auth]) if result.include?(:candlepin_auth)
+        ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
+        ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
+        ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
+        ping_katello_agent(result[:katello_agent]) if result.include?(:katello_agent)
+
+        # set overall status result code
+        result = {:services => result}
+        result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
+        result
+      end
+
       def fetch_proxy(capsule_id)
         capsule_id ? SmartProxy.unscoped.find(capsule_id) : SmartProxy.pulp_primary
       end

data/app/services/katello/pulp3/erratum.rb

@@ -35,7 +35,8 @@ module Katello
         custom_json["issued"] = convert_date_if_epoch(custom_json["issued"])
         custom_json["updated"] = convert_date_if_epoch(custom_json["updated"]) unless custom_json["updated"].blank?
 
-        if model.updated.blank? || (custom_json['updated'].to_datetime != model.updated.to_datetime)
+        if model.updated.blank? ||
+            (custom_json['updated'] && (custom_json['updated'].to_datetime != model.updated.to_datetime))
           custom_json['errata_id'] = custom_json.delete('id')
           custom_json['errata_type'] = custom_json.delete('type')
           custom_json['updated'] = custom_json['updated'].blank? ? custom_json['issued'] : custom_json['updated']

data/app/services/katello/pulp3/migration.rb

@@ -114,6 +114,44 @@ module Katello
         Katello::Pulp3::MigrationPlan.new(@repository_types).generate.as_json
       end
 
+      def reset
+        if @repository_types.empty?
+          fail ::Katello::Errors::Pulp3MigrationError, 'There are no Pulp 3 content types to reset'
+        end
+
+        plugins = @repository_types.sort.map do |repository_type|
+          {
+            type: ::Katello::Pulp3::MigrationPlan.pulp2_repository_type(repository_type)
+          }
+        end
+        plan = { plugins: plugins }
+
+        # TODO: Don't provide the plan as a string once this is resolved: https://pulp.plan.io/issues/8211
+        migration_plan_api.reset(migration_plan_api.create(plan: plan).pulp_href, plan.to_json)
+
+        content_types_for_migration.each do |content_type|
+          if content_type.model_class == ::Katello::Erratum
+            ::Katello::RepositoryErratum.update_all(erratum_pulp3_href: nil)
+          else
+            content_type.model_class.update_all(migrated_pulp3_href: nil)
+          end
+        end
+
+        @repository_types.each do |repo_type|
+          if repo_type == "file"
+            ::Katello::Repository.file_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          elsif repo_type == "docker"
+            ::Katello::Repository.docker_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          elsif repo_type == "yum"
+            ::Katello::Repository.yum_type.update(remote_href: nil, publication_href: nil, version_href: nil)
+          end
+        end
+
+        ::Katello::Pulp3::RepositoryReference.destroy_all
+        ::Katello::Pulp3::DistributionReference.destroy_all
+        ::Katello::Pulp3::ContentGuard.destroy_all
+      end
+
       def create_migrations
         plan = migration_plan
         Rails.logger.info("Migration Plan: #{plan}")
@@ -280,8 +318,7 @@ module Katello
             update_import_status("Importing migrated content type #{content_type.label}: #{current_count}/#{total_count}")
             migrated_units = pulp2_content_api.list(pulp2_id__in: needing_hrefs.map { |unit| unit.pulp_id }.join(','))
             migrated_units.results.each do |migrated_unit|
-              matching_record = needing_hrefs.find { |db_unit| db_unit.pulp_id == migrated_unit.pulp2_id }
-              matching_record&.update_column(:migrated_pulp3_href, migrated_unit.pulp3_content)
+              content_type.model_class.where(pulp_id: migrated_unit.pulp2_id).update_all(migrated_pulp3_href: migrated_unit.pulp3_content)
             end
           end
         end

data/app/services/katello/pulp3/migration_plan.rb

@@ -21,13 +21,13 @@ module Katello
       def generate_plugins
         @repository_types.sort.map do |repository_type|
           {
-            type: pulp2_repository_type(repository_type),
+            type: self.class.pulp2_repository_type(repository_type),
             repositories: repository_migrations(repository_type)
           }
         end
       end
 
-      def pulp2_repository_type(repository_type)
+      def self.pulp2_repository_type(repository_type)
         if repository_type == 'yum'
           return 'rpm' #migration plugin uses rpm
         else

data/app/services/katello/pulp3/repository.rb

@@ -309,7 +309,7 @@ module Katello
         }
         remote_options[:url] = root.url unless root.url.blank?
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?
-        if root.upstream_username && root.upstream_password
+        if !root.upstream_username.blank? && !root.upstream_password.blank?
           remote_options.merge!(username: root.upstream_username,
                                password: root.upstream_password)
         end

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -5,12 +5,9 @@ module Katello
         class << self
           def deliver!
             SmartProxy.unscoped.with_content.each do |proxy|
-              status = proxy.statuses[:pulp] || proxy.statuses[:pulpnode]
-              next unless (percentage = status&.storage&.dig('pulp_dir', 'percent'))
-
-              if percentage[0..2].to_i < 90 && notification_already_exists?(proxy)
+              if percentage < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
-              elsif update_notifications(proxy).empty? && percentage[0..2].to_i > 90
+              elsif update_notifications(proxy).empty? && percentage > 90
                 ::Notification.create!(
                   :subject => proxy,
                   :initiator => User.anonymous_admin,

data/app/views/smart_proxies/_disk_usage.html.erb

@@ -3,12 +3,14 @@
     <div class="progress-description" title="<%= disk['header'] %>">
       <%= disk['header'] %>
     </div>
+
     <div class="progress progress-label-top-right">
-      <div class="progress-bar progress-bar-<%= disk['size_status'] %>" role="progressbar" aria-valuenow="<%= disk['percent'].delete('%') %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= disk['percent'] %>;" data-toggle="tooltip" title="<%= _('%s Used') % disk['used'] %>">
-        <span><strong><%= _('%{used} of %{total}') % {:used => disk['used'],:total => disk['total']} %></strong> Used</span>
+      <div class="progress-bar progress-bar-<%= disk['size_status'] %>" role="progressbar" aria-valuenow="<%= disk['percentage'] %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= disk['percentage'] %>%;" data-toggle="tooltip" title="<%= _('%s Used') % humanize_bytes(disk['used']) %>">
+        <span><strong><%= _('%{used} of %{total}') % {:used => humanize_bytes(disk['used']),:total => humanize_bytes(disk['total'])} %></strong> Used</span>
       </div>
-      <div class="progress-bar progress-bar-remaining" role="progressbar" aria-valuenow="<%= disk['available_percent'].delete('%') %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= disk['available_percent'] %>;" data-toggle="tooltip" title="<%= _('%s Available') % disk['available'] %>">
-        <span class="sr-only"><%= _('%s Available') % disk['available'] %></span>
+
+      <div class="progress-bar progress-bar-remaining" role="progressbar" aria-valuenow="<%= disk['available_percent'] %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= disk['available_percent'] %>%;" data-toggle="tooltip" title="<%= _('%s Available') % humanize_bytes(disk['free']) %>">
+        <span class="sr-only"><%= _('%s Available') % humanize_bytes(disk['free']) %></span>
       </div>
     </div>
   </div>

data/db/migrate/20210218214048_change_default_content_view_version_export_history.rb

@@ -0,0 +1,5 @@
+class ChangeDefaultContentViewVersionExportHistory < ActiveRecord::Migration[6.0]
+  def change
+    change_column_default(:katello_content_view_version_export_histories, :export_type, nil)
+  end
+end

data/lib/katello/plugin.rb

@@ -293,7 +293,7 @@ Foreman::Plugin.register :katello do
     cx.add_pagelet :details_content,
                    :name => _('Storage'),
                    :partial => 'smart_proxies/show/storage',
-                   :onlyif => proc { |proxy| proxy.has_feature?(SmartProxy::PULP_FEATURE) || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) }
+                   :onlyif => proc { |proxy| proxy.has_feature?(SmartProxy::PULP_FEATURE) || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) || proxy.has_feature?(SmartProxy::PULP3_FEATURE) }
   end
 
   register_facet Katello::Host::ContentFacet, :content_facet do

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,6 +1,9 @@
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
-  task :pulp3_migration => ["dynflow:client", "check_ping"] do
+  task :pulp3_migration => ["dynflow:client"] do
+    services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
+    Katello::Ping.ping!(services: services)
+
     puts "Starting task."
     SmartProxy.pulp_primary.refresh
 
@@ -8,6 +11,7 @@ namespace :katello do
     wait = ::Foreman::Cast.to_bool(ENV['wait'] || 'true')
     preserve_output = ::Foreman::Cast.to_bool(ENV['preserve_output'])
 
+    User.current = User.anonymous_api_admin
     task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: reimport_all)
 
     if wait

data/lib/katello/tasks/pulp3_migration_reset.rake

@@ -0,0 +1,26 @@
+namespace :katello do
+  desc "Reset the Pulp 2 -> Pulp 3 migration for content types that haven't been fully switched over"
+  task :pulp3_migration_reset => ["dynflow:client", "check_ping"] do
+    puts "Starting Content Migration Reset."
+    SmartProxy.pulp_primary.refresh
+
+    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigrationReset, SmartProxy.pulp_primary)
+
+    if ENV['wait'].nil? || ::Foreman::Cast.to_bool(ENV['wait'])
+      until !task.pending? || task.paused?
+        sleep(20)
+        task = ForemanTasks::Task.find(task.id)
+      end
+
+      if task.result == 'warning' || task.result == 'pending'
+        msg = _("Content Migration Reset failed, You will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}\n")
+        $stderr.print(msg)
+        fail ForemanTasks::TaskError, task
+      else
+        puts _("Content Migration Reset completed successfully")
+      end
+    else
+      puts "Content Migration Reset started, you may monitor it at: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}"
+    end
+  end
+end

data/lib/katello/version.rb

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

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -51,8 +51,11 @@ class ManageManifestModal extends Component {
   showDeleteManifestModal = () =>
     this.props.setModalOpen({ id: DELETE_MANIFEST_MODAL_ID });
 
-  hideDeleteManifestModal = () =>
-    this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+  hideDeleteManifestModal = () => {
+    if (this.props.deleteManifestModalExists) {
+      this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+    }
+  };
 
   updateRepositoryUrl = (event) => {
     this.setState({ redhat_repository_url: event.target.value });
@@ -326,6 +329,7 @@ ManageManifestModal.propTypes = {
   canImportManifest: PropTypes.bool,
   canDeleteManifest: PropTypes.bool,
   isManifestImported: PropTypes.bool,
+  deleteManifestModalExists: PropTypes.bool,
   canEditOrganizations: PropTypes.bool,
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
@@ -351,6 +355,7 @@ ManageManifestModal.defaultProps = {
   canImportManifest: false,
   canDeleteManifest: false,
   isManifestImported: false,
+  deleteManifestModalExists: false,
   canEditOrganizations: false,
   simpleContentAccess: false,
   simpleContentAccessEligible: undefined,

data/webpack/scenes/Subscriptions/Manifest/index.js

@@ -20,6 +20,7 @@ const mapStateToProps = state => ({
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
+  deleteManifestModalExists: !!state.foremanModals.deleteManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
   simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -374,46 +374,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_certguard_client
   requirement: !ruby/object:Gem::Requirement
@@ -1086,6 +1080,7 @@ files:
 - app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb
 - app/lib/actions/pulp3/content_migration.rb
 - app/lib/actions/pulp3/content_migration_presenter.rb
+- app/lib/actions/pulp3/content_migration_reset.rb
 - app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/content_view_version/create_exporter.rb
 - app/lib/actions/pulp3/content_view_version/create_importer.rb
@@ -2168,6 +2163,7 @@ files:
 - db/migrate/20210128231228_add_type_and_from_cvv_to_cvv_export_history.rb
 - db/migrate/20210201163238_migrate_background_download_policy_to_migrate.rb
 - db/migrate/20210208213920_add_available_module_stream_context.rb
+- db/migrate/20210218214048_change_default_content_view_version_export_history.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4529,6 +4525,7 @@ files:
 - lib/katello/tasks/pulp3_content_switchover.rake
 - lib/katello/tasks/pulp3_migration.rake
 - lib/katello/tasks/pulp3_migration_abort.rake
+- lib/katello/tasks/pulp3_migration_reset.rake
 - lib/katello/tasks/pulp3_migration_stats.rake
 - lib/katello/tasks/pulp3_post_migration_check.rake
 - lib/katello/tasks/receptor/extract_orgs.rake