katello 3.1.0.1 → 3.2.0.rc1

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

@@ -0,0 +1,14 @@
+module Actions
+  module Katello
+    module Host
+      class Reassign < Actions::Base
+        def plan(host, content_view_id, environment_id)
+          host.content_facet.content_view = ::Katello::ContentView.find(content_view_id)
+          host.content_facet.lifecycle_environment = ::Katello::KTEnvironment.find(environment_id)
+
+          plan_action(::Actions::Katello::Host::Update, host)
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Actions
       class Register < Actions::EntryAction
         middleware.use ::Actions::Middleware::RemoteAction
 
-        def plan(host, system, consumer_params, content_view_environment, activation_keys = [])
+        def plan(host, consumer_params, content_view_environment, activation_keys = [])
           sequence do
             unless host.new_record?
               host.save!
@@ -19,10 +19,6 @@ module Actions
 
             fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
 
-            system = plan_system(system, content_view_environment, consumer_params)
-            system.save!
-
-            host.content_host = system
             host.save!
             host.content_facet = plan_content_facet(host, content_view_environment)
             host.subscription_facet = plan_subscription_facet(host, activation_keys, consumer_params)
@@ -36,7 +32,7 @@ module Actions
                                     consumer_parameters: consumer_params, activation_keys: activation_keys.map(&:cp_name))
             return if cp_create.error
 
-            plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name, :system_id => system.id)
+            plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name)
             plan_action(Pulp::Consumer::Create, uuid: cp_create.output[:response][:uuid], name: host.name)
           end
         end
@@ -60,10 +56,6 @@ module Actions
           host.subscription_facet.update_subscription_status
           host.content_facet.update_errata_status
           host.refresh_global_status!
-
-          system = ::Katello::System.find(input[:system_id])
-          system.uuid = input[:uuid]
-          system.save!
         end
 
         private
@@ -73,8 +65,7 @@ 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 &&
-               host_collection.systems.length >= host_collection.max_hosts
+            if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0
               fail _("Host collection '%{name}' exceeds maximum usage limit of '%{limit}'") %
                        {:limit => host_collection.max_hosts, :name => host_collection.name}
             end
@@ -93,16 +84,6 @@ module Actions
           end
         end
 
-        def plan_system(system, content_view_environment, consumer_params)
-          system.facts = consumer_params[:facts]
-          system.cp_type = consumer_params[:type]
-          system.name = consumer_params[:name]
-          system.serviceLevel = consumer_params[:serviceLevel]
-          system.content_view = content_view_environment.content_view
-          system.environment = content_view_environment.environment
-          system
-        end
-
         def plan_content_facet(host, content_view_environment)
           content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
           content_facet.content_view = content_view_environment.content_view

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

@@ -4,16 +4,29 @@ module Actions
       class RemoveSubscriptions < Actions::EntryAction
         middleware.use Actions::Middleware::KeepCurrentUser
 
-        def plan(host, entitlements)
+        def plan(host, pools_with_quantities_params)
           action_subject(host)
+          pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity|
+            ::Katello::PoolWithQuantities.fetch(pool_with_quantity)
+          end
+          cp_consumer = host.subscription_facet.candlepin_consumer
+          entitlements = pools_with_quantities.map do |pool_with_quantities|
+            cp_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities)
+          end
 
-          entitlements.each do |entitlement|
+          entitlements.flatten.each do |entitlement|
             plan_action(::Actions::Candlepin::Consumer::RemoveSubscription, :uuid => host.subscription_facet.uuid,
                         :entitlement_id => entitlement['id'], :pool_id => entitlement['pool']['id'])
             plan_self(:host_name => host.name)
           end
         end
 
+        def finalize
+          ::Katello::Pool.where(:id => input[:pool_ids]).each(&:import_data)
+          host = ::Host.find_by(:id => input[:managed][:id])
+          host.subscription_facet.update_subscription_status
+        end
+
         def rescue_strategy
           Dynflow::Action::Rescue::Skip
         end

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

@@ -22,12 +22,6 @@ module Actions
               plan_action(::Actions::Candlepin::Consumer::Update, host.subscription_facet.uuid, consumer_params)
             end
 
-            if host.content_facet && host.content_host
-              host.content_host.content_view = host.content_facet.try(:content_view)
-              host.content_host.environment = host.content_facet.try(:lifecycle_environment)
-              host.content_host.save!
-            end
-
             if host.subscription_facet.try(:autoheal)
               plan_action(::Actions::Candlepin::Consumer::AutoAttachSubscriptions, :uuid => host.subscription_facet.uuid)
             end

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

@@ -47,8 +47,8 @@ module Actions
 
         def remove_consumers(organization)
           concurrence do
-            organization.systems.each do |system|
-              plan_action(Katello::System::Destroy, system, skip_candlepin: true)
+            organization.hosts.each do |host|
+              plan_action(Katello::Host::Destroy, host, skip_candlepin: true)
             end
 
             organization.activation_keys.each do |key|

data/app/lib/actions/katello/product/content_destroy.rb

@@ -3,16 +3,14 @@ module Actions
     module Product
       class ContentDestroy < Actions::Base
         def plan(repository)
-          if !repository.product.provider.redhat_provider? &&
-               repository.other_repos_with_same_product_and_content.empty?
-            sequence do
-              plan_action(Candlepin::Product::ContentRemove,
-                          product_id: repository.product.cp_id,
+          fail _("Cannot delete redhat product content") if repository.product.redhat?
+          sequence do
+            plan_action(Candlepin::Product::ContentRemove,
+                        product_id: repository.product.cp_id,
+                        content_id: repository.content_id)
+            if repository.other_repos_with_same_content.empty?
+              plan_action(Candlepin::Product::ContentDestroy,
                           content_id: repository.content_id)
-              if repository.other_repos_with_same_content.empty?
-                plan_action(Candlepin::Product::ContentDestroy,
-                            content_id: repository.content_id)
-              end
             end
           end
         end

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

@@ -7,7 +7,12 @@ module Actions
           organization_destroy = options.fetch(:organization_destroy, false)
 
           unless organization_destroy || product.user_deletable?
-            fail _("Cannot delete a Red Hat Products or Products with Repositories published in a Content View")
+            if product.redhat?
+              fail _("Cannot delete Red Hat product: %{product}") % { :product => product.name }
+            elsif !product.published_content_view_versions.empty?
+              fail _("Cannot delete product with repositories published in a content view.  Product: %{product}, %{view_versions}") %
+                       { :product => product.name, :view_versions => view_versions(product) }
+            end
           end
 
           action_subject(product)
@@ -21,12 +26,10 @@ module Actions
                   plan_action(Katello::Repository::Destroy, repo, repo_options)
                 end
               end
-              concurrence do
-                plan_action(Candlepin::Product::DeletePools,
-                              cp_id: product.cp_id, organization_label: product.organization.label)
-                plan_action(Candlepin::Product::DeleteSubscriptions,
-                              cp_id: product.cp_id, organization_label: product.organization.label)
-              end
+              plan_action(Candlepin::Product::DeletePools,
+                            cp_id: product.cp_id, organization_label: product.organization.label)
+              plan_action(Candlepin::Product::DeleteSubscriptions,
+                            cp_id: product.cp_id, organization_label: product.organization.label)
             end
 
             if !product.used_by_another_org? && !organization_destroy
@@ -52,6 +55,19 @@ module Actions
         def humanized_name
           _("Delete Product")
         end
+
+        def view_versions(product)
+          cvvs = product.published_content_view_versions.uniq
+          views = cvvs.inject({}) do |result, version|
+            result[version.content_view.name] ||= []
+            result[version.content_view.name] << version.version
+            result
+          end
+          results = views.map do |view, versions|
+            _("Content View %{view}: Versions: %{versions}") % {:view => view, :versions => versions.join(', ')}
+          end
+          results.join(', ')
+        end
       end
     end
   end

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

@@ -7,6 +7,7 @@ module Actions
            Pulp::Repository::RemoveErrata,
            Pulp::Repository::RemovePackageGroup,
            Pulp::Repository::RemoveDistribution,
+           Pulp::Repository::RemoveFile,
            Pulp::Repository::RemovePuppetModule].each do |action_class|
             plan_action(action_class, pulp_id: repo.pulp_id)
           end

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

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module Repository
+      class CloneFileContent < Actions::Base
+        def plan(source_repo, target_repo)
+          sequence do
+            plan_action(Pulp::Repository::CopyFiles,
+                        source_pulp_id: source_repo.pulp_id,
+                        target_pulp_id: target_repo.pulp_id)
+            plan_action(Katello::Repository::MetadataGenerate, target_repo)
+            plan_action(Katello::Repository::IndexContent, id: target_repo.id)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,8 @@ module Actions
               plan_action(Repository::CloneDockerContent, repository, clone)
             elsif repository.ostree?
               plan_action(Repository::CloneOstreeContent, repository, clone)
+            elsif repository.file?
+              plan_action(Repository::CloneFileContent, repository, clone)
             end
           end
         end

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

@@ -20,6 +20,8 @@ module Actions
               plan_action(Repository::CloneDockerContent, repository, new_repository)
             elsif new_repository.ostree?
               plan_action(Repository::CloneOstreeContent, repository, new_repository)
+            elsif new_repository.file?
+              plan_action(Repository::CloneFileContent, repository, new_repository)
             end
           end
         end

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

@@ -27,7 +27,8 @@ module Actions
                                         path: path,
                                         download_policy: repository.download_policy,
                                         with_importer: true,
-                                        mirror_on_sync: repository.mirror_on_sync?)
+                                        mirror_on_sync: repository.mirror_on_sync?,
+                                        ssl_validation: certs[:ssl_validation])
 
             return if create_action.error
 

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

@@ -3,6 +3,7 @@ module Actions
     module Repository
       class Destroy < Actions::EntryAction
         middleware.use ::Actions::Middleware::RemoteAction
+        middleware.use ::Actions::Middleware::KeepCurrentUser
 
         # options:
         #   skip_environment_update - defaults to false. skips updating the CP environment
@@ -23,15 +24,14 @@ module Actions
           plan_action(ContentViewPuppetModule::Destroy, repository) if repository.puppet?
           plan_action(Pulp::Repository::Destroy, pulp_id: repository.pulp_id)
           sequence do
-            plan_action(Product::ContentDestroy, repository)
-            plan_action(Repository::DestroyMedium, repository)
-
-            view_env = repository.content_view.content_view_environment(repository.environment)
             repository.destroy! if planned_destroy
-
-            if !skip_environment_update && ::SETTINGS[:katello][:use_cp] && view_env
-              plan_action(ContentView::UpdateEnvironment, repository.content_view, repository.environment)
+            if repository.redhat?
+              handle_redhat_content(repository)
+            else
+              handle_custom_content(repository) unless skip_environment_update
             end
+
+            plan_action(Repository::DestroyMedium, repository)
           end
 
           plan_self(:user_id => ::User.current.id, :planned_destroy => planned_destroy)
@@ -39,12 +39,22 @@ module Actions
 
         def finalize
           unless input[:planned_destroy]
-            ::User.current = ::User.find(input[:user_id])
             repository = ::Katello::Repository.find(input[:repository][:id])
             repository.destroy!
           end
-        ensure
-          ::User.current = nil
+        end
+
+        def handle_custom_content(repository)
+          #if this is the last instance of a custom repo, destroy the content
+          if repository.other_repos_with_same_product_and_content.empty?
+            plan_action(Product::ContentDestroy, repository)
+          end
+        end
+
+        def handle_redhat_content(repository)
+          if repository.content_view.content_view_environment(repository.environment)
+            plan_action(ContentView::UpdateEnvironment, repository.content_view, repository.environment)
+          end
         end
 
         def humanized_name

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

@@ -13,11 +13,11 @@ module Actions
           ::User.current = ::User.anonymous_admin
 
           repo = ::Katello::Repository.find(input[:repo])
-          users = ::User.select { |user| user.receives?(:katello_sync_errata) && user.can?(:view_products, repo.product) }.compact
+          users = ::User.select { |user| user.receives?(:sync_errata) && user.can?(:view_products, repo.product) }.compact
           errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', input[:last_updated].to_datetime).pluck(:erratum_id))
 
           begin
-            MailNotification[:katello_sync_errata].deliver_now(:users => users, :repo => repo, :errata => errata) unless users.blank?
+            MailNotification[:sync_errata].deliver_now(:users => users, :repo => repo, :errata => errata) unless users.blank?
           rescue => e
             message = _('Unable to send errata e-mail notification: %{error}' % {:error => e})
             Rails.logger.error(message)

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

@@ -17,6 +17,8 @@ module Actions
             repo.index_db_puppet_modules
           elsif repo.docker?
             repo.index_db_docker_manifests
+          elsif repo.file?
+            repo.index_db_files
           else
             ::Katello::Rpm.import_all(unit_ids, true)
           end

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

@@ -2,17 +2,21 @@ module Actions
   module Katello
     module Repository
       class ImportUpload < Actions::EntryAction
-        def plan(repository, upload_id)
+        def plan(repository, upload_id, unit_key = {})
           action_subject(repository)
           import_upload = plan_action(Pulp::Repository::ImportUpload,
                                       pulp_id: repository.pulp_id,
                                       unit_type_id: repository.unit_type_id,
-                                      unit_key: {},
+                                      unit_key: unit_key,
                                       upload_id: upload_id)
 
           plan_action(FinishUpload, repository, import_upload.output)
         end
 
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+
         def humanized_name
           _("Upload into")
         end

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

@@ -21,6 +21,8 @@ module Actions
                           Pulp::Repository::RemovePuppetModule
                         when ::Katello::Repository::DOCKER_TYPE
                           Pulp::Repository::RemoveDockerManifest
+                        when ::Katello::Repository::FILE_TYPE
+                          Pulp::Repository::RemoveFile
                         end
 
           uuids = content_units.map(&:uuid)

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

@@ -23,18 +23,14 @@ module Actions
             fail _("Unable to sync repo. This repository does not have a feed url.")
           end
 
-          if incremental && URI(source_url).scheme != 'file'
-            fail _("URL must be of scheme 'file' for incremental import")
-          end
-
           sequence do
-            if incremental
-              output = plan_action(Katello::Repository::IncrementalImport, repo,
-                                    URI(source_url).path).output
-            else
-              output = plan_action(Pulp::Repository::Sync, pulp_id: repo.pulp_id,
-                                   task_id: pulp_sync_task_id, source_url: source_url).output
-            end
+            sync_args = {:pulp_id => repo.pulp_id,
+                         :task_id => pulp_sync_task_id,
+                         :source_url => source_url}
+
+            sync_args[:remove_missing] = false if incremental
+
+            output = plan_action(Pulp::Repository::Sync, sync_args).output
 
             contents_changed = output[:contents_changed]
             plan_action(Katello::Repository::IndexContent, :id => repo.id, :contents_changed => contents_changed)
@@ -65,7 +61,7 @@ module Actions
 
         def pulp_task_id
           pulp_action = planned_actions(Pulp::Repository::Sync).first
-          if pulp_task = Array(pulp_action.external_task).first
+          if (pulp_task = Array(pulp_action.external_task).first)
             pulp_task.fetch(:task_id)
           end
         end

data/app/lib/actions/katello/repository_set/disable_repository.rb

@@ -7,12 +7,13 @@ module Actions
         end
 
         def plan(product, content, options)
-          if repository = repository_mapper(product,
-                                            content,
-                                            options,
-                                            options[:registry_name]).find_repository
+          repository = repository_mapper(product,
+                                         content,
+                                         options,
+                                         options[:registry_name]).find_repository
+          if repository
             action_subject(repository)
-            plan_action(Repository::Destroy, repository)
+            plan_action(Repository::Destroy, repository, :planned_destroy => true)
           else
             fail ::Katello::Errors::NotFound, _('Repository not found')
           end

data/app/lib/actions/katello/repository_set/enable_repository.rb

@@ -13,7 +13,7 @@ module Actions
             fail ::Katello::Errors::ConflictException, _("The repository is already enabled")
           end
           repository = mapper.build_repository
-          plan_action(Repository::Create, repository)
+          plan_action(Repository::Create, repository, false, true)
           action_subject(repository)
         end