katello 4.5.1 → 4.8.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/katello-features.run.js

@@ -27,6 +27,7 @@
             'content-credentials.new',
             'content-credential.info',
             'content-credential.products',
+            'content-credential.acs',
             'content-credential.repositories'
         ];
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html

@@ -12,7 +12,7 @@
 
     <div class="help-block">
       <span translate>
-        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced.
+        Selecting "Complete Sync" will cause only yum/deb repositories of the selected product to be synced.
       </span>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -30,6 +30,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 $scope.repository['ignore_srpms'] = $scope.repository['ignorable_content'] && $scope.repository['ignorable_content'].includes("srpm");
                 $scope.repository['ansible_collection_auth_exists'] = $scope.repository['ansible_collection_auth_url'] && $scope.repository['ansible_collection_auth_token'];
                 $scope.genericContentTypes = RepositoryTypesService.genericContentTypes($scope.repository['content_type']);
+                $scope.immediateDownloadPolicy = $scope.repository['download_policy'] === 'immediate';
             });
 
             $scope.gpgKeys = function () {
@@ -140,6 +141,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);
+                    $scope.immediateDownloadPolicy = repository['download_policy'] === 'immediate';
                     $scope.repository.ignore_srpms = $scope.repository.ignorable_content && $scope.repository.ignorable_content.includes("srpm");
                     if (!_.isEmpty(response["include_tags"])) {
                         repository.commaIncludeTags = repository["include_tags"].join(", ");

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -84,6 +84,13 @@
             return result;
         };
 
+        $scope.hideActionsButtons = function(repository) {
+            if (repository.library_instance_id) {
+                return true;
+            }
+            return false;
+        };
+
         $scope.disableSyncLink = function (adavancedSync) {
             return $scope.hideSyncButton($scope.repository, adavancedSync);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html

@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <div class="radio" ng-hide="repository.content_type === 'deb'">
+  <div class="radio">
     <label>
       <input type="radio" ng-model="syncType" value="skipMetadataCheck" />
       <span translate>
@@ -21,10 +21,10 @@
     </label>
     <div class="help-block">
       <span translate>
-        Sync even if the upstream metadata appears to have no change. This option is only relevant for yum repositories and will take longer than an optimized sync. Choose this option if:
+        Sync even if the upstream metadata appears to have no change. This option is only relevant for yum/deb repositories and will take longer than an optimized sync. Choose this option if:
       </span>
       <ul class="list-aligned">
-        <li translate>One or more RPMs are not showing up in the local repository even though they exist in the upstream repository.</li>
+        <li translate>One or more packages are not showing up in the local repository even though they exist in the upstream repository.</li>
       </ul>
     </div>
-  </div>
+  </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html

@@ -6,7 +6,7 @@
   </header>
 
   <div data-block="item-actions" bst-feature-flag="custom_products">
-    <span select-action-dropdown>
+    <span ng-hide="hideActionsButtons(repository)" select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu">
         <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
           <a ng-click="syncRepository(repository)" disable-link="disableSyncLink()" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -315,6 +315,13 @@
             options-format="id as name for (id, name) in options"
             on-save="save(repository)">
         </dd>
+        <dd>
+          <p bst-alert='info' ng-show="immediateDownloadPolicy && repository.download_policy == 'on_demand'">
+            <span translate>
+              Changing download policy to "On Demand" will also clear the checksum type if set. The repository will use the upstream checksum type to verify downloads.
+            </span>
+          </p>
+        </dd>
       </span>
       <span>
         <dt translate>Mirroring Policy</dt>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -169,7 +169,7 @@
         })
         .state('product.repository.tasks.index', {
             url: '/tasks',
-            permission: 'view_repositories',
+            permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-tasks.html',
             ncyBreadcrumb: {
                 label: "{{'Tasks' | translate }}",
@@ -178,7 +178,7 @@
         })
         .state('product.repository.tasks.details', {
             url: '/tasks/:taskId',
-            permission: 'view_repositories',
+            permission: 'view_products',
             controller: 'TaskDetailsController',
             templateUrl: 'tasks/views/task-details.html',
             ncyBreadcrumb: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -3,8 +3,8 @@
 This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories.
   </span>
 </div>
-<div id="non-sca-banner" bst-alert="warning" ng-if="isManifestImported && !simpleContentAccessEnabled">
+<div id="non-sca-banner" bst-alert="warning" ng-if="!simpleContentAccessEnabled">
   <span translate>
-This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Legacy subscription management is deprecated and will be removed in a future version.
+This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in a future version.
   </span>
 </div>

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -25,7 +25,6 @@ module BastionKatello
           activation_keys
           content_credentials
           content_hosts
-          legacy
           debs
           docker_tags
           files

data/lib/katello/engine.rb

@@ -40,8 +40,7 @@ module Katello
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil,
-          :notifier_ca_path => "/etc/pki/tls/certs/ca-bundle.crt"
+          :sync_KBlimit => nil
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',
@@ -147,7 +146,6 @@ module Katello
         )
       end
 
-      Katello::EventDaemon::Runner.initialize
       Katello::EventDaemon::Runner.register_service(:candlepin_events, Katello::CandlepinEventListener)
       Katello::EventDaemon::Runner.register_service(:katello_events, Katello::EventMonitor::PollerThread)
       Katello::EventDaemon::Runner.register_service(:katello_agent_events, Katello::EventDaemon::Services::AgentEventReceiver) if ::Katello.with_katello_agent?
@@ -176,6 +174,7 @@ module Katello
 
       #Controller extensions
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
+      ::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
@@ -213,8 +212,10 @@ module Katello
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
+      ::Api::V2::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
+      ::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth
       ::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
       ::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions
 

data/lib/katello/permission_creator.rb

@@ -83,6 +83,7 @@ module Katello
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
+                   'katello/api/v2/repositories' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
                    'katello/errata' => [:short_details, :auto_complete],
                    'katello/packages' => [:details, :auto_complete],
@@ -283,8 +284,7 @@ module Katello
                          :finder_scope => :readable
       @plugin.permission :create_products,
                          {
-                           'katello/api/v2/products' => [:create],
-                           'katello/api/v2/package_groups' => [:create]
+                           'katello/api/v2/products' => [:create]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -304,8 +304,7 @@ module Katello
                            'katello/api/v2/products' => [:destroy],
                            'katello/api/v2/repositories' => [:destroy],
                            'katello/api/v2/products_bulk_actions' => [:destroy_products],
-                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
-                           'katello/api/v2/package_groups' => [:destroy]
+                           'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :deletable
@@ -350,8 +349,8 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible],
-                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible, :simple_content_access_status],
+                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible, :status]
                          },
                          :resource_type => 'Katello::Subscription'
     end

data/lib/katello/permissions/host_permissions.rb

@@ -52,6 +52,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/index',
   'katello/api/v2/host_subscriptions/events',
   'katello/api/v2/host_subscriptions/product_content',
+  'katello/api/v2/host_subscriptions/enabled_repositories',
   'katello/api/v2/hosts_bulk_actions/applicable_errata',
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',

data/lib/katello/permissions/registry_permissions.rb

@@ -8,13 +8,13 @@ Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat
   'katello/api/registry/registry_proxies/catalog',
   'katello/api/registry/registry_proxies/tags_list',
   'katello/api/registry/registry_proxies/pull_manifest',
-  'katello/api/registry/registry_proxies/push_manifest',
+  #'katello/api/registry/registry_proxies/push_manifest',
   'katello/api/registry/registry_proxies/pull_blob',
   'katello/api/registry/registry_proxies/check_blob',
-  'katello/api/registry/registry_proxies/start_upload_blob',
-  'katello/api/registry/registry_proxies/upload_blob',
-  'katello/api/registry/registry_proxies/chunk_upload_blob',
-  'katello/api/registry/registry_proxies/finish_upload_blob',
+  #'katello/api/registry/registry_proxies/start_upload_blob',
+  #'katello/api/registry/registry_proxies/upload_blob',
+  #'katello/api/registry/registry_proxies/chunk_upload_blob',
+  #'katello/api/registry/registry_proxies/finish_upload_blob',
   'katello/api/registry/registry_proxies/status_upload_blob',
   'katello/api/registry/registry_proxies/cancel_upload_blob'
 ]

data/lib/katello/plugin.rb

@@ -44,6 +44,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :alternate_content_sources,
+         :url => '/alternate_content_sources',
+         :url_hash => {:controller => 'katello/api/v2/alternate_content_sources',
+                       :action => 'index'},
+         :caption => N_('Alternate Content Sources'),
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     menu :top_menu,
          :sync_plans,
          :caption => N_('Sync Plans'),
@@ -155,7 +164,7 @@ Foreman::Plugin.register :katello do
     menu :top_menu,
          :ansible_collections,
          :caption => N_('Ansible Collections'),
-         :url => '/ansible_collections',
+         :url => '/content/ansible_collections',
          :url_hash => {:controller => 'katello/api/v2/ansible_collections',
                        :action => 'index'},
          :engine => Katello::Engine,
@@ -195,15 +204,6 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
-  menu :labs_menu,
-       :alternate_content_sources,
-       :url => '/labs/alternate_content_sources',
-       :url_hash => {:controller => 'katello/api/v2/alternate_content_sources_controller',
-                     :action => 'index'},
-       :caption => N_('Alternate Content Sources'),
-       :parent => :lab_features_menu,
-       :turbolinks => false
-
   extend_template_helpers Katello::KatelloUrlsHelper
   extend_template_helpers Katello::Concerns::BaseTemplateScopeExtensions
 
@@ -230,7 +230,7 @@ Foreman::Plugin.register :katello do
   parameter_filter ::Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
   parameter_filter Organization, :label, :service_level
-  parameter_filter SmartProxy, :download_policy, :lifecycle_environment_ids => []
+  parameter_filter SmartProxy, :download_policy, :http_proxy_id, :lifecycle_environment_ids => []
 
   logger :glue, :enabled => true
   logger :pulp_rest, :enabled => true
@@ -265,6 +265,29 @@ Foreman::Plugin.register :katello do
       :onlyif => proc { |proxy| proxy.pulp_primary? }
   end
 
+  extend_page 'hosts/_list' do |context|
+    context.with_profile :content, _('Content'), default: false do
+      common_th_class = 'hidden-tablet hidden-xs'
+      common_td_class = "#{common_th_class} ellipsis"
+      use_pagelet :hosts_table_column_header, :name
+      use_pagelet :hosts_table_column_content, :name
+      add_pagelet :hosts_table_column_header, key: :subscription_status, label: _('Subscription status'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :subscription_status, class: common_td_class, callback: ->(host) { host_status_icon(host.subscription_global_status) }
+      add_pagelet :hosts_table_column_header, key: :installable_updates, label: _('Installable updates'), class: common_th_class, width: '15%'
+      add_pagelet :hosts_table_column_content, key: :installable_updates, class: common_td_class, callback: ->(host) { errata_counts(host) }
+      use_pagelet :hosts_table_column_header, :os_title
+      use_pagelet :hosts_table_column_content, :os_title
+      add_pagelet :hosts_table_column_header, key: :lifecycle_environment, label: _('Lifecycle environment'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :lifecycle_environment, class: common_td_class, callback: ->(host) { host.content_facet&.single_lifecycle_environment&.name }
+      add_pagelet :hosts_table_column_header, key: :content_view, label: _('Content view'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :content_view, class: common_td_class, callback: ->(host) { host.content_facet&.single_content_view&.name }
+      add_pagelet :hosts_table_column_header, key: :registered_at, label: _('Registered'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :registered_at, class: common_td_class, callback: ->(host) { host_registered_time(host) }
+      add_pagelet :hosts_table_column_header, key: :last_checkin, label: _('Last checkin'), sortable: true, class: common_th_class, width: '10%'
+      add_pagelet :hosts_table_column_content, key: :last_checkin, class: common_td_class, callback: ->(host) { host_checkin_time(host) }
+    end
+  end
+
   ::Katello::HostStatusManager::STATUSES.each do |status_class|
     register_custom_status(status_class)
   end
@@ -323,6 +346,7 @@ Foreman::Plugin.register :katello do
       }]
       download_policies = proc { hashify_parameters(::Katello::RootRepository::DOWNLOAD_POLICIES) }
       proxy_download_policies = proc { hashify_parameters(::SmartProxy::DOWNLOAD_POLICIES) }
+      export_formats = proc { hashify_parameters(::Katello::Pulp3::ContentViewVersion::Export::FORMATS) }
 
       def hashify_parameters(parameters)
         Hash[parameters.map { |p| [p, p] }]
@@ -333,6 +357,12 @@ Foreman::Plugin.register :katello do
         templates.each_with_object({}) { |tmpl, hash| hash[tmpl.name] = tmpl.name }
       end
 
+      setting 'allow_multiple_content_views',
+        type: :boolean,
+        default: false,
+        full_name: N_('Allow multiple content views'),
+        description: N_("Allow a host to be registered to multiple content view environments with 'subscription-manager register --environments'.") # TODO: update this description when AKs support this setting as well
+
       setting 'content_default_http_proxy',
         type: :string,
         default: nil,
@@ -445,8 +475,8 @@ Foreman::Plugin.register :katello do
       setting 'errata_status_installable',
         type: :boolean,
         default: false,
-        full_name: N_('Installable errata from content view'),
-        description: N_("Calculate errata host status based only on errata in a host's content view and lifecycle environment")
+        full_name: N_('Generate errata status from directly-installable content'),
+        description: N_("If true, only errata that can be installed without an incremental update will affect the host's errata status.")
 
       setting 'restrict_composite_view',
         type: :boolean,
@@ -499,12 +529,6 @@ Foreman::Plugin.register :katello do
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
-      setting 'pulp_docker_registry_port',
-        type: :integer,
-        default: 5000,
-        full_name: N_('Pulp Docker registry port'),
-        description: N_("The port used by Pulp Crane to provide Docker Registries")
-
       setting 'pulp_export_destination',
         type: :string,
         default: "/var/lib/pulp/katello-export",
@@ -517,17 +541,12 @@ Foreman::Plugin.register :katello do
         full_name: N_('Pulp 3 export destination filepath'),
         description: N_("On-disk location for pulp 3 exported repositories")
 
-      setting 'pulp_client_key',
+      setting 'default_export_format',
         type: :string,
-        default: "/etc/pki/katello/private/pulp-client.key",
-        full_name: N_('Pulp client key'),
-        description: N_("Path for ssl key used for pulp server auth")
-
-      setting 'pulp_client_cert',
-        type: :string,
-        default: "/etc/pki/katello/certs/pulp-client.crt",
-        full_name: N_('Pulp client cert'),
-        description: N_("Path for ssl cert used for pulp server auth")
+        default: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE,
+        full_name: N_('Default export format'),
+        description: N_("Default export format for content-exports(either 'syncable' or 'importable')"),
+        collection: export_formats
 
       setting 'sync_total_timeout',
         type: :integer,
@@ -673,6 +692,12 @@ Foreman::Plugin.register :katello do
         default: true,
         full_name: N_('Allow deleting repositories in published content views'),
         description: N_("If this is enabled, repositories can be deleted even when they belong to published content views. The deleted repository will be removed from all content view versions.")
+
+      setting 'distribute_archived_cvv',
+        type: :boolean,
+        default: true,
+        full_name: N_('Distribute archived content view versions'),
+        description: N_("If this is enabled, repositories of content view versions without environments (\"archived\") will be distributed at '/pulp/content/<organization>/content_views/<content view>/X.Y/...'.")
     end
   end
 
@@ -706,14 +731,14 @@ Foreman::Plugin.register :katello do
 
   add_controller_action_scope('HostsController', :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+      .preload(:subscription_facet)
+      .preload(content_facet: [:bound_repositories])
   end
 
   add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+      .preload(:subscription_facet)
+      .preload(content_facet: [:bound_repositories])
   end
 
   register_info_provider Katello::Host::InfoProvider

data/lib/katello/repository_types/README.md

@@ -1,23 +1,52 @@
 # Registering a new repository type
 
-Full example:
+# Full example:
 
 ```ruby
-
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
-  service_class Katello::Pulp::Repository::Yum
+  pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_api_class Katello::Pulp3::Api::Yum
+  pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 
-  content_type Katello::Rpm, :priority => 1, :pulp2_service_class => ::Katello::Pulp::Rpm
-  content_type Katello::Erratum, :priority => 2, :pulp2_service_class => ::Katello::Pulp::Erratum
-  content_type Katello::ModuleStream, :priority => 3, :pulp2_service_class => ::Katello::Pulp::ModuleStream
-  content_type Katello::PackageGroup, :pulp2_service_class => ::Katello::Pulp::PackageGroup
-  content_type Katello::YumMetadataFile, :pulp2_service_class => ::Katello::Pulp::YumMetadataFile
-  content_type Katello::Srpm, :pulp2_service_class => ::Katello::Pulp::Srpm
+  client_module_class PulpRpmClient
+  api_class PulpRpmClient::ApiClient
+  remote_class PulpRpmClient::RpmRpmRemote
+  remotes_api_class PulpRpmClient::RemotesRpmApi
+  repository_versions_api_class PulpRpmClient::RepositoriesRpmVersionsApi
+  repositories_api_class PulpRpmClient::RepositoriesRpmApi
+  configuration_class PulpRpmClient::Configuration
+  distributions_api_class PulpRpmClient::DistributionsRpmApi
+  distribution_class PulpRpmClient::RpmRpmDistribution
+  publication_class PulpRpmClient::RpmRpmPublication
+  publications_api_class PulpRpmClient::PublicationsRpmApi
+  repo_sync_url_class PulpRpmClient::RpmRepositorySyncURL
+
+  default_managed_content_type Katello::Rpm::CONTENT_TYPE
+  content_type Katello::Rpm,
+    priority: 1,
+    pulp3_service_class: ::Katello::Pulp3::Rpm,
+    primary_content: true,
+    removable: true,
+    uploadable: true
+  content_type Katello::ModuleStream,
+    priority: 2,
+    pulp3_service_class: ::Katello::Pulp3::ModuleStream
+  content_type Katello::Erratum, priority: 3,
+    pulp3_service_class: ::Katello::Pulp3::Erratum,
+    primary_content: true, mutable: true
+  content_type Katello::PackageGroup,
+    pulp3_service_class: ::Katello::Pulp3::PackageGroup
+  content_type Katello::Srpm,
+    pulp3_service_class: ::Katello::Pulp3::Srpm,
+    removable: true, uploadable: true
+  content_type Katello::Distribution, priority: 4,
+    pulp3_service_class: ::Katello::Pulp3::Distribution,
+    index: false
+  content_type Katello::PackageCategory, priority: 4, index: false
 
   index_additional_data { |repo, target_repo = nil| repo.import_distribution_data(target_repo) }
 end
-
 ```
 
 ## DSL breakdown
@@ -28,24 +57,44 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
 ```
 This declares the the repository type, specifying a type identifier (e.g. 'yum')
 
-### Service class
+### Service class and friends
 
 ```ruby
-  service_class Katello::Pulp::Repository::Yum
+  pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_api_class Katello::Pulp3::Api::Yum
+  pulp3_plugin 'rpm'
+  ...
 ```
 
-Identifies the service class that is used to interface with pulp 2 and includes methods for creating and updating the type of repository
- 
+Identifies the service class that is used to interface with Pulp and includes methods for creating and updating the type of repository. Also notes the location of the main API class and the name of the corresponding Pulp plugin.
+There are a number of other classes that need to be defined, so follow the [full example](full-example) above to ensure that the new type has
+all the neccessary information.
+
  ### Content Type
- 
+
 ```ruby
-  content_type Katello::Rpm, :priority => 1, :pulp2_service_class => ::Katello::Pulp::Rpm
+  default_managed_content_type Katello::Rpm::CONTENT_TYPE
+  content_type Katello::Rpm,
+    priority: 1,
+    pulp3_service_class: ::Katello::Pulp3::Rpm,
+    primary_content: true,
+    removable: true,
+    uploadable: true
 ```
 
-Defines a content type to be used by the repository.  The first argument is the Active Record model class representing the content type.  This should extend the `Katello::Concerns::PulpDatabaseUnit` class.
+The `default_managed_content_type` method sets the Rpm content type as the default content type, which
+the repository type will act upon when another content type is not explicitly declared. For example, a yum upload
+will assume that the uploaded content is of Rpm type unless otherwise specified.
+
+The `content_type` method defines a content type to be used by the repository.  The first argument is the Active Record model class representing the content type.  This should extend the `Katello::Concerns::PulpDatabaseUnit` class.
 The second argument is an options hash that includes:
 * priority - The ordering used when indexing or performing other operations (1 is highest, defaults to 99)
-* pulp2_service_class - The service class representing this content type in pulp 2
+* pulp3_service_class - The service class representing this content type
+* primary_content - The indexing of this content type is recorded for display after syncing
+* removable - Content units of this type can be deleted from a repository
+* uploadable - Content units of this type can be uploaded to a repository
+* index - Content units of this type will be indexed
+
 
 ### Additional custom indexing
 
@@ -61,4 +110,72 @@ Provides a block that will be executed after other repository indexing completes
 prevent_unneeded_metadata_publish
 ```
 
-This option declares that this content type supports the CheckMatchingContent middleware where by repositories are not actually republished in pulp if no content changes.
+This option declares that this content type supports the CheckMatchingContent middleware, which removes the need to republish repositories in Pulp when content doesn't change.
+
+### Generic content types
+
+For content types that are simple enough to support it, the "generic content type" framework can be used.
+If no special models are required to support the new content type, the only information that needs to be added
+about the type would be what exists in the repository type definition.
+The `generic_content_type` and `generic_remote_option` methods exist to define all other attributes that are needed to
+create a generic type.
+To create a generic content type, follow the Python type as an example:
+
+```ruby
+Katello::RepositoryTypeManager.register('python') do
+  allow_creation_by_user true
+  pulp3_service_class Katello::Pulp3::Repository::Generic
+  pulp3_api_class Katello::Pulp3::Api::Generic
+  pulp3_plugin 'python'
+
+  client_module_class PulpPythonClient
+  api_class PulpPythonClient::ApiClient
+  configuration_class PulpPythonClient::Configuration
+  remote_class PulpPythonClient::PythonPythonRemote
+  remotes_api_class PulpPythonClient::RemotesPythonApi
+  repositories_api_class PulpPythonClient::RepositoriesPythonApi
+  repository_versions_api_class PulpPythonClient::RepositoriesPythonVersionsApi
+  distributions_api_class PulpPythonClient::DistributionsPypiApi
+  distribution_class PulpPythonClient::PythonPythonDistribution
+  publication_class PulpPythonClient::PythonPythonPublication
+  publications_api_class PulpPythonClient::PublicationsPypiApi
+  repo_sync_url_class PulpPythonClient::RepositorySyncURL
+
+  generic_remote_option :includes, title: N_("Includes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
+                        description: N_("Python packages to include from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0. Leave empty to include every package.")
+
+  generic_remote_option :excludes, title: N_("Excludes"), type: Array, input_type: "textarea", delimiter: "\\n", default: [],
+                        description: N_("Python packages to exclude from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0.")
+
+  generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",", default: [],
+                        description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
+
+  url_description N_("URL of a PyPI content source such as https://pypi.org.")
+
+  generic_content_type 'python_package',
+                       pluralized_name: "Python Packages",
+                       model_class: Katello::GenericContentUnit,
+                       pulp3_api: PulpPythonClient::ContentPackagesApi,
+                       pulp3_model: PulpPythonClient::PythonPythonPackageContent,
+                       pulp3_service_class: Katello::Pulp3::GenericContentUnit,
+                       model_name: lambda { |pulp_unit| pulp_unit["name"] },
+                       model_version: lambda { |pulp_unit| pulp_unit["version"] },
+                       model_filename: lambda { |pulp_unit| pulp_unit["filename"] },
+                       model_additional_metadata: lambda { |pulp_unit|
+                         {
+                           "package_type": pulp_unit["packagetype"],
+                           "sha256": pulp_unit["sha256"]
+                         }
+                       },
+                       removable: true,
+                       uploadable: true,
+                       duplicates_allowed: false,
+                       filename_key: :filename,
+                       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/deb.rb

@@ -1,5 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
-  service_class Katello::Pulp::Repository::Deb
   pulp3_service_class Katello::Pulp3::Repository::Apt
   pulp3_api_class Katello::Pulp3::Api::Apt
   pulp3_plugin 'deb'
@@ -16,7 +15,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   distribution_class PulpDebClient::DebAptDistribution
   publication_class PulpDebClient::DebAptPublication
   publications_api_class PulpDebClient::PublicationsAptApi
-  repo_sync_url_class PulpDebClient::RepositorySyncURL
+  repo_sync_url_class PulpDebClient::AptRepositorySyncURL
 
   default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,