katello 4.1.4 → 4.2.0.rc1

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

@@ -47,7 +47,7 @@ module Katello
         create_remote unless fetch_remote
       end
 
-      def create(_force = false)
+      def create
         api.repositories_api.create(name: backend_object_name)
       end
 
@@ -170,7 +170,7 @@ module Katello
       end
 
       def pulp3_enabled_repo_types
-        Katello::RepositoryTypeManager.repository_types.values.select do |repository_type|
+        Katello::RepositoryTypeManager.enabled_repository_types.values.select do |repository_type|
           smart_proxy.pulp3_repository_type_support?(repository_type)
         end
       end

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

@@ -45,9 +45,9 @@ module Katello
         tasks.flatten
       end
 
-      def pulp3_enabled_repo_types(check_pulp2_preferred = true)
-        Katello::RepositoryTypeManager.repository_types.values.select do |repository_type|
-          smart_proxy.pulp3_repository_type_support?(repository_type, check_pulp2_preferred)
+      def pulp3_enabled_repo_types
+        Katello::RepositoryTypeManager.enabled_repository_types.values.select do |repository_type|
+          smart_proxy.pulp3_repository_type_support?(repository_type)
         end
       end
 
@@ -55,7 +55,7 @@ module Katello
         # Each key is a Pulp 3 plugin API and each value is the list of version_hrefs
         repo_version_map = {}
         pulp3_enabled_repo_types.each do |repo_type|
-          api = repo_type.pulp3_service_class.api(smart_proxy)
+          api = repo_type.pulp3_api(smart_proxy)
           version_hrefs = api.repository_versions.select { |repo_version| repo_version.number != 0 }.map(&:pulp_href)
           repo_version_map[api] = version_hrefs - ::Katello::Repository.where(version_href: version_hrefs).pluck(:version_href)
         end

data/app/services/katello/registration_manager.rb

@@ -50,6 +50,16 @@ module Katello
         Katello::Host::SubscriptionFacet::DMI_UUID_ALLOWED_DUPS
       end
 
+      def dmi_uuid_change_allowed?(host, host_uuid_overridden)
+        if host_uuid_overridden
+          true
+        elsif host.build && Setting[:host_profile_assume_build_can_change]
+          true
+        else
+          Setting[:host_profile_assume]
+        end
+      end
+
       def find_existing_hosts(host_name, host_uuid)
         query = ::Host.unscoped.where("#{::Host.table_name}.name = ?", host_name)
 
@@ -77,11 +87,14 @@ module Katello
           host = hosts.first
 
           if host.name == host_name
-            unless Setting[:host_profile_assume] || host.subscription_facet.nil? || host.build || host_uuid_overridden
-              current_dmi_uuid = host.subscription_facet.dmi_uuid
-              if current_dmi_uuid && current_dmi_uuid != host_uuid
-                registration_error("This host is reporting a DMI UUID that differs from the existing registration.")
-              end
+            if !host.build && Setting[:host_re_register_build_only]
+              registration_error("Host with name %{host_name} is currently registered but not in build mode (host_re_register_build_only==True). Unregister the host manually or put it into build mode to continue.", host_name: host_name)
+            end
+
+            current_dmi_uuid = host.subscription_facet&.dmi_uuid
+            dmi_uuid_changed = current_dmi_uuid && current_dmi_uuid != host_uuid
+            if dmi_uuid_changed && !dmi_uuid_change_allowed?(host, host_uuid_overridden)
+              registration_error("This host is reporting a DMI UUID that differs from the existing registration.")
             end
 
             return true
@@ -249,8 +262,6 @@ module Katello
       end
 
       def delete_agent_queue(host)
-        return unless ::Katello.with_katello_agent?
-
         queue_name = Katello::Agent::Dispatcher.host_queue_name(host)
         Katello::EventQueue.push_event(::Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, host.id) do |attrs|
           attrs[:metadata] = { queue_name: queue_name }

data/app/services/katello/repository_type.rb

@@ -13,7 +13,10 @@ module Katello
     end
 
     def_field :allow_creation_by_user, :service_class, :pulp3_service_class, :pulp3_plugin,
-              :pulp3_skip_publication, :pulp3_api_class
+              :pulp3_skip_publication, :configuration_class, :partial_repo_path, :pulp3_api_class,
+              :repositories_api_class, :api_class, :remotes_api_class, :repository_versions_api_class,
+              :distributions_api_class, :remote_class, :repo_sync_url_class, :client_module_class,
+              :distribution_class, :publication_class, :publications_api_class, :model_name, :model_version
 
     attr_accessor :metadata_publish_matching_check, :index_additional_data_proc
     attr_reader :id, :unique_content_per_repo
@@ -22,6 +25,8 @@ module Katello
       @id = id.to_sym
       allow_creation_by_user(true)
       @unique_content_per_repo = false
+      @content_types = []
+      @generic_remote_options = []
     end
 
     def set_unique_content_per_repo
@@ -32,6 +37,10 @@ module Katello
       @content_types.sort_by(&:priority)
     end
 
+    def generic_remote_options
+      @generic_remote_options.sort_by(&:name)
+    end
+
     def content_types_to_index
       if SmartProxy.pulp_primary&.pulp3_repository_type_support?(self)
         # type.index being false supersedes type.index_on_pulp3 being true
@@ -54,6 +63,16 @@ module Katello
       @content_types << ContentType.new(options.merge(:model_class => model_class))
     end
 
+    def generic_content_type(content_type, options = {})
+      @content_types ||= []
+      @content_types << GenericContentType.new(options.merge(:content_type => content_type))
+    end
+
+    def generic_remote_option(name, options = {})
+      @generic_remote_options ||= []
+      @generic_remote_options << GenericRemoteOption.new(options.merge(:name => name))
+    end
+
     def prevent_unneeded_metadata_publish
       self.metadata_publish_matching_check = true
     end
@@ -75,6 +94,14 @@ module Katello
       }
     end
 
+    def pulp3_api(smart_proxy)
+      if pulp3_api_class == Katello::Pulp3::Api::Generic
+        pulp3_api_class.new(smart_proxy, self)
+      else
+        pulp3_api_class ? pulp3_api_class.new(smart_proxy) : Katello::Pulp3::Api::Core.new(smart_proxy)
+      end
+    end
+
     class ContentType
       attr_accessor :model_class, :priority, :pulp2_service_class, :pulp3_service_class, :index, :uploadable, :removable, :index_on_pulp3
 
@@ -93,5 +120,36 @@ module Katello
         self.model_class::CONTENT_TYPE
       end
     end
+
+    class GenericContentType < ContentType
+      attr_accessor :pulp3_api, :pulp3_model, :content_type
+
+      def initialize(options)
+        self.model_class = options[:model_class]
+        self.priority = options[:priority] || 99
+        self.pulp3_service_class = options[:pulp3_service_class]
+        self.index = options[:index].nil? ? true : options[:index]
+        self.index_on_pulp3 = options[:index_on_pulp3].nil? ? true : options[:index_on_pulp3]
+        self.uploadable = options[:uploadable] || false
+        self.removable = options[:removable] || false
+        self.pulp3_api = options[:pulp3_api]
+        self.pulp3_model = options[:pulp3_model]
+        self.content_type = options[:content_type]
+      end
+
+      def label
+        self.model_class::CONTENT_TYPE
+      end
+    end
+
+    class GenericRemoteOption
+      attr_accessor :name, :type, :description
+
+      def initialize(options)
+        self.name = options[:name]
+        self.type = options[:type]
+        self.description = options[:description]
+      end
+    end
   end
 end

data/app/services/katello/repository_type_manager.rb

@@ -1,69 +1,125 @@
 module Katello
   class RepositoryTypeManager
-    @repository_types = {}
+    PULP3_FEATURE = "Pulpcore".freeze
+
+    @defined_repository_types = {}
+    @enabled_repository_types = {}
+    begin
+      @pulp_primary = ::SmartProxy.unscoped.detect { |proxy| !proxy.setting(PULP3_FEATURE, 'mirror') }
+    rescue ActiveRecord::StatementInvalid
+      @pulp_primary = nil
+    end
     class << self
       private :new
-      attr_reader :repository_types
+      attr_reader :defined_repository_types
 
       # Plugin constructor
       def register(id, &block)
-        configured = SETTINGS[:katello][:content_types].nil? || SETTINGS[:katello][:content_types].with_indifferent_access[id]
-        if find(id).blank? && configured
-          repository_type = ::Katello::RepositoryType.new(id)
-          repository_type.instance_eval(&block) if block_given?
-          repository_types[id.to_s] = repository_type
+        if @pulp_primary&.has_feature?(PULP3_FEATURE) && @pulp_primary&.capabilities(PULP3_FEATURE)&.empty?
+          fix_pulp3_capabilities
+        end
+        defined_repo_type = find_defined(id)
+        if defined_repo_type.blank?
+          defined_repo_type = ::Katello::RepositoryType.new(id)
+          defined_repo_type.instance_eval(&block) if block_given?
+          @defined_repository_types[id.to_s] = defined_repo_type
+        end
+        if find(id).blank? && defined_repo_type.present?
+          enabled_repository_types[id.to_s] = defined_repo_type if pulp3_plugin_installed?(id)
+        end
+      end
+
+      def fix_pulp3_capabilities
+        save_pulp_primary if @pulp_primary.nil?
+        @pulp_primary&.refresh
+        if @pulp_primary&.capabilities(PULP3_FEATURE)&.empty?
+          fail Katello::Errors::PulpcoreMissingCapabilities
+        end
+      end
+
+      def enabled_repository_types(update = true)
+        disabled_types = @defined_repository_types.keys - @enabled_repository_types.keys
+        if update && disabled_types.present?
+          disabled_types.each { |repo_type| update_enabled_repository_type(repo_type.to_s) }
+        end
+        @enabled_repository_types
+      end
+
+      def creatable_repository_types(enabled_only = true)
+        repo_types = enabled_only ? enabled_repository_types : defined_repository_types
+        repo_types.select do |repo_type, _|
+          creatable_by_user?(repo_type, enabled_only)
         end
       end
 
-      def creatable_repository_types
-        repository_types.select do |repo_type, _|
-          creatable_by_user?(repo_type)
+      def generic_repository_types(enabled_only = true)
+        repo_types = enabled_only ? enabled_repository_types : defined_repository_types
+        repo_types.select do |_, values|
+          values.pulp3_service_class == Katello::Pulp3::Repository::Generic
         end
       end
 
-      def enabled_content_types
-        list = repository_types.values.map do |type|
+      def pulp3_plugin_installed?(repository_type)
+        save_pulp_primary
+        @pulp_primary&.capabilities(PULP3_FEATURE)&.include?(@defined_repository_types[repository_type].pulp3_plugin)
+      end
+
+      def enabled_content_types(enabled_only = true)
+        repo_types = enabled_only ? enabled_repository_types : defined_repository_types
+        list = repo_types.values.map do |type|
           type.content_types.map(&:model_class).flatten.map { |ct| ct::CONTENT_TYPE }
         end
         list.flatten
       end
 
       def indexable_content_types
-        repository_types.
+        enabled_repository_types.
                   values.
                   map(&:content_types_to_index).
                   flatten
       end
 
-      def creatable_by_user?(repository_type)
-        return false unless (type = find(repository_type))
+      def creatable_by_user?(repository_type, enabled_only = true)
+        type = enabled_only ? find(repository_type) : find_defined(repository_type)
+        return false unless type
         type.allow_creation_by_user
       end
 
-      def removable_content_types
-        list = @repository_types.values.map do |type|
+      def removable_content_types(enabled_only = true)
+        repo_types = enabled_only ? enabled_repository_types : defined_repository_types
+        list = repo_types.values.map do |type|
           type.content_types.select(&:removable)
         end
         list.flatten
       end
 
-      def uploadable_content_types
-        list = @repository_types.values.map do |type|
+      def uploadable_content_types(enabled_only = true)
+        repo_types = enabled_only ? enabled_repository_types : defined_repository_types
+        list = repo_types.values.map do |type|
           type.content_types.select(&:uploadable)
         end
         list.flatten
       end
 
+      def find_defined(repository_type)
+        @defined_repository_types[repository_type.to_s]
+      end
+
       def find(repository_type)
-        repository_types[repository_type.to_s]
+        # Skip updating disabled repo types because find() updates the input type if necessary
+        found_repo_type = enabled_repository_types(false)[repository_type.to_s]
+        if found_repo_type.blank?
+          found_repo_type = update_enabled_repository_type(repository_type.to_s)
+        end
+        found_repo_type
       end
 
       def find_by(attribute, value)
-        repository_types.values.find { |type| type.try(attribute) == value }
+        enabled_repository_types.values.find { |type| type.try(attribute) == value }
       end
 
       def find_repository_type(katello_label)
-        repository_types.values.each do |repo_type|
+        enabled_repository_types.values.each do |repo_type|
           repo_type.content_types.each do |content_type|
             return repo_type if content_type.label == katello_label.to_s
           end
@@ -72,7 +128,7 @@ module Katello
       end
 
       def find_content_type(katello_label)
-        repository_types.values.each do |repo_type|
+        enabled_repository_types.values.each do |repo_type|
           repo_type.content_types.each do |content_type|
             return content_type if content_type.label == katello_label.to_s
           end
@@ -81,7 +137,7 @@ module Katello
       end
 
       def model_class(pulp_service_class)
-        repository_types.values.each do |repo_type|
+        enabled_repository_types.values.each do |repo_type|
           repo_type.content_types.each do |content_type|
             return content_type.model_class if (content_type.pulp2_service_class == pulp_service_class || content_type.pulp3_service_class == pulp_service_class)
           end
@@ -95,6 +151,42 @@ module Katello
       def enabled?(repository_type)
         find(repository_type).present?
       end
+
+      def check_content_matches_repo_type!(repository, content_type)
+        repo_content_types = repository.repository_type.content_types.collect { |type| type.label }
+        unless repo_content_types.include?(content_type)
+          fail _("Content type %{content_type} is incompatible with repositories of type %{repo_type}") %
+                 { content_type: content_type, repo_type: repository.content_type }
+        end
+      end
+
+      def generic_remote_options(opts = {})
+        options = []
+        repo_types = opts[:defined_only] ? defined_repository_types : enabled_repository_types
+        repo_types.each do |_, type|
+          if opts[:content_type]
+            (options << type.generic_remote_options).flatten! if type.pulp3_service_class == Katello::Pulp3::Repository::Generic && type.id.to_s == opts[:content_type]
+          else
+            (options << type.generic_remote_options).flatten! if type.pulp3_service_class == Katello::Pulp3::Repository::Generic
+          end
+        end
+        options
+      end
+
+      private
+
+      def update_enabled_repository_type(repository_type)
+        defined_repo_type = find_defined(repository_type.to_s)
+        if defined_repo_type.present? && pulp3_plugin_installed?(repository_type.to_s)
+          @enabled_repository_types[repository_type.to_s] = defined_repo_type
+        end
+      end
+
+      def save_pulp_primary
+        @pulp_primary = ::SmartProxy.unscoped.detect { |proxy| !proxy.setting(PULP3_FEATURE, 'mirror') }
+      rescue ActiveRecord::StatementInvalid
+        @pulp_primary = nil
+      end
     end
   end
 end

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

@@ -15,11 +15,11 @@ node :next_version do |content_view|
 end
 
 child :last_task => :last_task do |_task|
-  attributes :task_id => :id
-  attributes :status => :result
+  attributes :id
+  attributes :result => :result
   node :last_sync_words do |object|
-    if object.try(:created_at)
-      time_ago_in_words(Time.parse(object.created_at.to_s))
+    if object.try(:started_at)
+      time_ago_in_words(Time.parse(object.started_at.to_s))
     end
   end
 end

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -27,6 +27,7 @@ glue(@resource.root) do
   attributes :http_proxy_policy
   attributes :http_proxy_id
   attributes :http_proxy_name
+  attributes :retain_package_versions_count
 
   node :http_proxy do
     attributes :id => @resource.root&.http_proxy&.id, :name => @resource.root&.http_proxy&.name, :policy => @resource.root&.http_proxy_policy

data/app/views/smart_proxies/plugins/_pulpcore.html.erb

@@ -8,12 +8,9 @@
   </div>
   <div class="col-md-8">
     <ul style="list-style-type: none; padding: 0">
-    <% @smart_proxy.supported_pulp_types[:pulp3][:supported_types].each do |content_type| %>
+    <% @smart_proxy.supported_pulp_types.each do |content_type| %>
       <li><%= content_type %></li>
     <% end %>
-    <% @smart_proxy.supported_pulp_types[:pulp3][:overriden_to_pulp2].each do |content_type| %>
-      <li><%= content_type + " (supported, but overridden to use Pulp 2)" %></li>
-    <% end %>
     </ul>
   </div>
-</div>
+</div>

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

@@ -25,10 +25,3 @@
 <div class="col-md-4">
   <strong><%= _('Supported Content Types') %></strong>
 </div>
-<div class="col-md-8">
-  <ul style="list-style-type: none; padding: 0">
-  <% @smart_proxy.supported_pulp_types[:pulp2][:supported_types].each do |content_type| %>
-    <li><%= content_type %></li>
-  <% end %>
-  </ul>
-</div>

data/config/katello.yaml.example

@@ -1,15 +1,4 @@
 :katello:
-  #if this block is not define, all types are enabled
-  #types are defined in lib/katello/repository_types/*.rb
-  :content_types:
-    :yum: true
-    :file: true
-    :deb: true
-    :puppet: true
-    :docker: true
-    :ostree: true
-    :ansible_collection: true
-
   :rest_client_timeout: 30
   :gpg_strict_validation: false
 
@@ -42,10 +31,6 @@
     # :bulk_load_size: 1000
   # Setup your pulp environment here
   :pulp:
-    # refers to the url of the pulp
-    # example https://localhost/pulp/api
-    :url: https://localhost/pulp/api/v2/
-
     :sync_threads: 4
     # refers to the apache certificate
     # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
@@ -60,12 +45,6 @@
     :url: amqp:ssl:katello-devel.example.com:5671
     :subscriptions_queue_address: katello_event_queue
 
-  # Internal configuration for communication from server to pulp crane service.
-  :container_image_registry:
-    :crane_url: https://localhost:5000
-    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt
-    :allow_push: false  # default false if omitted
-
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes/api/v2.rb

@@ -63,6 +63,7 @@ Katello::Engine.routes.draw do
         end
 
         match '/content_views/:composite_content_view_id/content_view_components' => 'content_view_components#index', :via => :get
+        match '/content_views/:composite_content_view_id/content_view_components/show_all' => 'content_view_components#show_all', :via => :get
         match '/content_views/:composite_content_view_id/content_view_components/:id' => 'content_view_components#show', :via => :get
         match '/content_views/:composite_content_view_id/content_view_components/add' => 'content_view_components#add_components', :via => :put
         match '/content_views/:composite_content_view_id/content_view_components/remove' => 'content_view_components#remove_components', :via => :put
@@ -74,6 +75,7 @@ Katello::Engine.routes.draw do
             post :copy
             post :publish
             put :remove
+            put :remove_filters
             match '/environments/:environment_id' => "content_views#remove_from_environment", :via => :delete
           end
           api_resources :filters, :controller => :content_view_filters do
@@ -402,7 +404,6 @@ Katello::Engine.routes.draw do
             put :remove_content
             post :sync
             post :verify_checksum
-            post :export
             post :upload_content
             put :import_uploads
           end