katello 4.3.0.rc4 → 4.4.0.rc2

data/lib/katello/repository_types/file.rb

@@ -19,7 +19,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   repo_sync_url_class PulpFileClient::RepositorySyncURL
 
   content_type Katello::FileUnit,
-               :pulp2_service_class => ::Katello::Pulp::FileUnit,
                :pulp3_service_class => ::Katello::Pulp3::FileUnit,
                :removable => true,
                :uploadable => true

data/lib/katello/repository_types/ostree.rb

@@ -21,12 +21,14 @@ Katello::RepositoryTypeManager.register('ostree') do
   url_description N_("URL of an OSTree repository.")
 
   generic_content_type 'ostree_ref',
+                       pluralized_name: "OSTree Refs",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpOstreeClient::ContentRefsApi,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
                        model_name: lambda { |pulp_unit| pulp_unit["name"] },
                        model_version: lambda { |pulp_unit| pulp_unit["checksum"] },
                        uploadable: true,
+                       generic_browser: true,
                        repository_import_on_upload: true
 
   import_attribute :ref, :content_type => 'ostree_ref',
@@ -35,12 +37,6 @@ Katello::RepositoryTypeManager.register('ostree') do
                         :type => String,
                         :required => false
 
-  import_attribute :parent_commit, :content_type => 'ostree_ref',
-                        :api_param => :ostree_parent_commit,
-                        :description => "Checksum of a parent commit",
-                        :type => String,
-                        :required => false
-
   import_attribute :repository_name, :content_type => 'ostree_ref',
                         :api_param => :ostree_repository_name,
                         :description => "Name of the repository in the ostree archive",
@@ -48,4 +44,6 @@ Katello::RepositoryTypeManager.register('ostree') do
                         :required => true
 
   default_managed_content_type :ostree_ref
+
+  test_url 'https://fixtures.pulpproject.org/ostree/small/'
 end

data/lib/katello/repository_types/python.rb

@@ -49,6 +49,10 @@ Katello::RepositoryTypeManager.register('python') do
                        uploadable: true,
                        duplicates_allowed: false,
                        filename_key: :filename,
-                       generic_browser: true
+                       generic_browser: true,
+                       test_upload_path: 'test/fixtures/files/shelf_reader-0.1-py2-none-any.whl'
   default_managed_content_type :python_package
+
+  test_url 'https://fixtures.pulpproject.org/python-pypi/'
+  test_url_root_options generic_remote_options: {includes: ['celery']}.to_json
 end

data/lib/katello/repository_types/yum.rb

@@ -21,35 +21,28 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   default_managed_content_type Katello::Rpm::CONTENT_TYPE
   content_type Katello::Rpm,
     :priority => 1,
-    :pulp2_service_class => ::Katello::Pulp::Rpm,
     :pulp3_service_class => ::Katello::Pulp3::Rpm,
     :primary_content => true,
     :removable => true,
     :uploadable => true
   content_type Katello::ModuleStream,
     :priority => 2,
-    :pulp2_service_class => ::Katello::Pulp::ModuleStream,
     :pulp3_service_class => ::Katello::Pulp3::ModuleStream
   content_type Katello::Erratum, :priority => 3,
-    :pulp2_service_class => ::Katello::Pulp::Erratum,
     :pulp3_service_class => ::Katello::Pulp3::Erratum,
-    :primary_content => true
+    :primary_content => true, :mutable => true
   content_type Katello::PackageGroup,
-    :pulp2_service_class => ::Katello::Pulp::PackageGroup,
     :pulp3_service_class => ::Katello::Pulp3::PackageGroup
   content_type Katello::YumMetadataFile,
-    :pulp2_service_class => ::Katello::Pulp::YumMetadataFile,
     :pulp3_service_class => ::Katello::Pulp3::YumMetadataFile,
     :index_on_pulp3 => false
   content_type Katello::Srpm,
-    :pulp2_service_class => ::Katello::Pulp::Srpm,
     :pulp3_service_class => ::Katello::Pulp3::Srpm,
     :removable => true, :uploadable => true
   content_type Katello::Distribution, :priority => 4,
-    :pulp2_service_class => ::Katello::Pulp::Distribution,
     :pulp3_service_class => ::Katello::Pulp3::Distribution,
     :index => false
-  content_type Katello::PackageCategory, :priority => 4, :pulp2_service_class => ::Katello::Pulp::PackageCategory, :index => false
+  content_type Katello::PackageCategory, :priority => 4, :index => false
 
   index_additional_data { |repo, target_repo = nil| repo.import_distribution_data(target_repo) }
 end

data/lib/katello/tasks/content_view_import_only.rake

@@ -0,0 +1,34 @@
+namespace :katello do
+  desc <<-DESCRIPTION
+  Marks a content view import only or otherwise. Only 'import_only' Content Views can import content via import/export process.
+  Options:
+    ID - ID of the content view that will be marked import
+    VALUE - If true the provided content view will be marked as import_only. This is the default.
+            If false the import_only flag of provided content view will be reset.
+  DESCRIPTION
+
+  task :set_content_view_import_only => ["environment"] do
+    def fetch_content_view
+      if ENV['ID'].blank?
+        fail 'Content view `ID` required.'
+      end
+      ::Katello::ContentView.find_by(id: ENV['ID'])
+    end
+
+    def mark_import_only(value: true)
+      User.current = User.anonymous_admin
+      content_view = fetch_content_view
+      fail('Composite content views cannot be marked import_only. Check the content view id.') if content_view.composite?
+      fail('Default Organization View cannot be marked import_only. Check the content view id.') if content_view.default?
+      content_view.import_only = value
+      if content_view.save(validate: false)
+        $stdout.print("Content View '#{content_view.name}'s import_only value updated to #{content_view.import_only} ")
+      else
+        $stderr.print("Unable to set the content view import_only to #{value}. Check the content view id.")
+        $stderr.print(content_view.errors.inspect)
+      end
+    end
+    value = ENV['VALUE'].blank? || ::Foreman::Cast.to_bool(ENV['VALUE'])
+    mark_import_only(value: value)
+  end
+end

data/lib/katello/tasks/import_applicability.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   task :import_applicability => ["environment"] do
     Katello::Host::ContentFacet.find_each do |facet|
-      facet.import_applicability
+      facet.calculate_and_import_applicability
     rescue StandardError => exception
       puts _('Error importing applicability for %{name} - %{id}: %{message}') %
           {:name => facet.host.name, :id => facet.host.id, :message => exception.message}

data/lib/katello/tasks/jenkins.rake

@@ -2,8 +2,6 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 
 begin
   namespace :jenkins do
-    ENV['USE_MEAN_TIME_REPORTER'] = '1' unless ENV['USE_MEAN_TIME_REPORTER'] == '0'
-
     task :katello do
       Rake::Task['jenkins:setup:minitest'].invoke
       Rake::Task['rake:test:katello'].invoke

data/lib/katello/tasks/repository.rake

@@ -119,7 +119,10 @@ namespace :katello do
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true) if commit?
+      if commit?
+        ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true)
+        repo.reload.index_content
+      end
     else
       puts "Deleting #{repo.id}"
       ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo) if commit?

data/lib/katello/tasks/upgrades/4.4/publish_import_cvvs.rake

@@ -0,0 +1,17 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '4.4' do
+      desc "Republish imported CVs that aren't published"
+      task :publish_import_cvvs => ["environment"] do
+        ::ForemanTasks.dynflow.config.remote = true
+        ::ForemanTasks.dynflow.initialize!
+
+        User.current = User.anonymous_admin
+
+        Katello::Repository.in_content_views(Katello::ContentView.where(:import_only => true)).where(:publication_href => nil).pluck(:content_view_version_id).uniq.each do |cvv_id|
+          ForemanTasks.async_task(Actions::Katello::ContentViewVersion::RepublishRepositories, ::Katello::ContentViewVersion.find(cvv_id))
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.3.0.rc4".freeze
+  VERSION = "4.4.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -1,7 +1,6 @@
 # Autogenerated!
-_("Remote action:")
-_("Export Library")
 _("Import")
+_("Export Library")
 _("Export")
 _("Copy version units to library")
 _("Create Import History")
@@ -28,19 +27,19 @@ _("Fetch pxe files")
 _("Errata mail")
 _("Discover")
 _("Delete Package Group")
-_("Create")
 _("Delete")
+_("Create")
 _("Update http proxy")
 _("Reindex subscriptions")
 _("Delete Product")
 _("Product Create")
 _("Destroy")
 _("Combined Profile Update")
-_("Package Profile Update")
 _("Updating System Purpose for host")
 _("Update release version for host")
 _("Update for host")
 _("Update Content Overrides")
+_("Package Profile Update")
 _("Remove subscriptions")
 _("Hypervisors update")
 _("Hypervisors")
@@ -61,14 +60,16 @@ _("Publish")
 _("Promotion to Environment")
 _("Promote")
 _("Incremental Update of  Content View Version(s) ")
+_("Update CDN Configuration")
 _("Sync capsule")
 _("Synchronize smart proxy")
 _("Generate repository applicability")
 _("Bulk generate applicability for hosts")
 _("Generate host applicability")
 _("Agent action")
-_("Delete Activation Key")
 _("Abstract async task")
-_("Import Puppet classes")
-_("Import facts")
+_("Delete Activation Key")
 _("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Remote action:")