katello 4.2.1 → 4.3.0.rc1

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

@@ -69,6 +69,9 @@
                name="url"
                ng-model="repository.url"
                type="text"/>
+        <p class="help-block" ng-show="urlDescription" translate>
+          {{urlDescription}}
+        </p>
         <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
           URL of the registry you want to sync. Example: https://registry-1.docker.io/ or https://quay.io/
         </p>
@@ -77,6 +80,11 @@
                                                                       uib-popover-html="collectionURLPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Upstream URL">
         </a>
         </p>
+	<p class="help-block" ng-show="repository.content_type === 'deb'" translate>
+         URL to the repository base. Example: http://ftp.de.debian.org/debian/ <a class="fa fa-question-circle" ng-show="repository.content_type === 'deb'"
+                                                                        uib-popover-html="debURLPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Upstream URL">
+        </a>
+       </p>
 
       </div>
 
@@ -116,23 +124,37 @@
         </p>
       </div>
 
-      <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases' | translate }}">
+      <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases/Distributions' | translate }}">
         <input id="deb_releases"
                name="deb_releases"
                ng-model="repository.deb_releases"
                type="text"/>
         <p class="help-block" translate>
-          Whitespace-separated list of releases (suite or codename) to sync from. Default: stable
+          Whitespace-separated list of releases/distributions to sync (required for syncing). Example: buster <a class="fa fa-question-circle" ng-show="repository.content_type === 'deb'"
+                                                                        uib-popover-html="distPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Releases/Distributions">
+        </a>
         </p>
+        <div ng-hide="validateDebAttrList('deb_releases')">
+                <br />
+                <div class="alert alert-danger" ><strong>Warning. </strong>Are you sure you want to add a comma in this whitespace separated list of distributions?</div>
+       </div>
+     
       </div>
+
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Components' | translate }}">
-        <input id="deb_comonents"
+        <input id="deb_components"
                name="deb_components"
                ng-model="repository.deb_components"
                type="text"/>
         <p class="help-block" translate>
-          Whitespace-separated list of components to sync from (leave clear to sync all). Example: main
+          Whitespace-separated list of components to sync (leave clear to sync all). Example: main <a class="fa fa-question-circle" ng-show="repository.content_type === 'deb'"
+                                                                        uib-popover-html="componentPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Components">
+        </a>
         </p>
+        <div ng-hide="validateDebAttrList('deb_components')">
+                <br />
+                <div class="alert alert-danger" ><strong>Warning. </strong>Are you sure you want to add a comma in this whitespace separated list of components?</div>
+       </div>
       </div>
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Architectures' | translate }}">
         <input id="deb_architectures"
@@ -140,30 +162,16 @@
                ng-model="repository.deb_architectures"
                type="text"/>
         <p class="help-block" translate>
-          Whitespace-separated list of processor architectures to filter the sync by. Example: amd64
-        </p>
-      </div>
-
-      <div bst-form-group label="{{ 'Upstream Sync Policy' | translate }}"  ng-if="repository.content_type === 'ostree'">
-        <select required
-                id="ostree_upstream_sync_policy"
-                name="ostree_upstream_sync_policy"
-                ng-model="repository.ostree_upstream_sync_policy"
-                ng-options="id as name for (id, name) in ostreeUpstreamSyncPolicies">
-        </select>
-
-        <input id="ostree_upstream_sync_depth"
-               name="ostree_upstream_sync_depth"
-               ng-model="repository.ostree_upstream_sync_depth"
-               type="number"
-               ng-disabled="repository.ostree_upstream_sync_policy !== 'custom'"/>
-        <p class="help-block" translate>
-          Choose one of the policy selections for downloading ostree content from upstream url during synchronization. Choose "Latest" for downloading the latest version of the upstream branch. Choose "All History" to download all available versions of the upstream repository (this may take a large amount of space). Choose "Custom Depth" and provide an number to indicate the number of prior versions of the upstream branch to download.
+          Whitespace-separated list of processor architectures to sync (leave clear to sync all). Example: amd64 <a class="fa fa-question-circle" ng-show="repository.content_type === 'deb'"
+                                                                        uib-popover-html="archPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Architectures">
+        </a>
         </p>
-
+        <div ng-hide="validateDebAttrList('deb_architectures')">
+                <br />
+                <div class="alert alert-danger" ><strong>Warning. </strong>Are you sure you want to add a comma in this whitespace separated list of architectures?</div>
+       </div>
       </div>
 
-
       <div bst-form-group label="{{ 'Upstream Repository Name' | translate }}"  ng-if="repository.content_type === 'docker'">
         <input id="docker_upstream_name"
                name="docker_upstream_name"
@@ -229,7 +237,29 @@
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum'">
+      <div ng-repeat="option in genericRemoteOptions" ng-if="repository.generic_remote_options !== []">
+        <div ng-if='option.input_type=="text"' bst-form-group label="{{ option.title | translate }}">
+          <input
+                  type="option.input_type"
+                  name="option_name"
+                  ng-model="genericRemoteOptions[$index].value"/>
+          <p class="help-block" translate>
+            {{option.description}}
+          </p>
+        </div>
+        <div ng-if='option.input_type=="textarea"' bst-form-group label="{{ option.title | translate }}">
+	  <textarea
+              id="option-{{$index}}"
+              name="option-{{$index}}"
+              ng-model="genericRemoteOptions[$index].value"
+              type="text"/>
+          <p class="help-block" translate>
+            {{option.description}}
+          </p>
+        </div>
+      </div>
+
+      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb'">
         <select id="download_policy"
                 name="download_policy"
                 ng-model="repository.download_policy"
@@ -299,7 +329,7 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-hide="repository.content_type === 'ostree' || repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
+      <div class="checkbox" ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <label>
           <input id="unprotected" name="unprotected" ng-model="repository.unprotected" type="checkbox"/>
           <span translate>Publish via HTTP</span>

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

@@ -20,6 +20,7 @@ angular.module('Bastion.repositories', [
     'Bastion.docker-manifests',
     'Bastion.docker-manifest-lists',
     'Bastion.files',
+    'Bastion.generic-content',
     'Bastion.debs'
 ]);
 

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

@@ -91,7 +91,7 @@
             }
         })
         .state('product.repository.manage-content.docker-manifests', {
-            url: '/content/docker_manifests',
+            url: '/docker_manifests',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-docker-manifests.html',
             ncyBreadcrumb: {
@@ -100,7 +100,7 @@
             }
         })
         .state('product.repository.manage-content.docker-tags', {
-            url: '/content/docker_tags',
+            url: '/docker_tags',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-docker-tags.html',
             ncyBreadcrumb: {
@@ -109,7 +109,7 @@
             }
         })
         .state('product.repository.manage-content.docker-manifest-lists', {
-            url: '/content/docker_manifest_lists',
+            url: '/docker_manifest_lists',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-docker-manifest-lists.html',
             ncyBreadcrumb: {
@@ -118,7 +118,7 @@
             }
         })
         .state('product.repository.manage-content.files', {
-            url: '/content/files',
+            url: '/files',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-files.html',
             ncyBreadcrumb: {
@@ -127,7 +127,7 @@
             }
         })
         .state('product.repository.manage-content.ostree-branches', {
-            url: '/content/ostree_branches',
+            url: '/ostree_branches',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-ostree-branches.html',
             ncyBreadcrumb: {
@@ -145,7 +145,7 @@
             }
         })
         .state('product.repository.manage-content.debs', {
-            url: '/content/debs',
+            url: '/debs',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-debs.html',
             ncyBreadcrumb: {
@@ -154,13 +154,22 @@
             }
         })
         .state('product.repository.manage-content.ansible-collections', {
-            url: '/content/ansible_collections',
+            url: '/ansible_collections',
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-ansible-collections.html',
             ncyBreadcrumb: {
               label: "{{'Ansible Collections' | translate }}",
               parent: 'product.repository.info'
             }
+        })
+        .state('product.repository.manage-content.generic-content', {
+            url: '/:contentTypeLabel',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-generic-content.html',
+            ncyBreadcrumb: {
+                label: "{{ content_type.pluralized_name }}",
+                parent: 'product.repository.info'
+            }
         });
 
         $stateProvider.state('product.repository.tasks', {

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

@@ -21,11 +21,28 @@
             });
         };
 
-        this.repositoryTypeEnabled = function (desiredType) {
-            var found = _.find(repositoryTypes, function(type) {
-                return type.id === desiredType;
+        this.genericContentTypes = function (repoTypeLabel) {
+            var types;
+            var typesToSearch = repositoryTypes;
+            if (angular.isDefined(repoTypeLabel)) {
+                typesToSearch = [this.repositoryType(repoTypeLabel)];
+            }
+            types = _.map(typesToSearch, function(repoType) {
+                return _.filter(repoType['content_types'], function(contentType) {
+                    return contentType.generic;
+                });
+            });
+            return [].concat.apply([], types);
+        };
+
+        this.repositoryType = function (typeLabel) {
+            return _.find(repositoryTypes, function(type) {
+                return type.id === typeLabel;
             });
-            return angular.isDefined(found);
+        };
+
+        this.repositoryTypeEnabled = function (desiredType) {
+            return angular.isDefined(this.repositoryType(desiredType));
         };
 
         this.pulp3Supported = function(desiredType) {
@@ -35,6 +52,15 @@
 
             return found.pulp3_support;
         };
+
+        this.getAttribute = function(repository, key) {
+            var typeIndex = repositoryTypes.map(function(type) {
+                return type.name;
+            }).indexOf(repository.content_type);
+            if (angular.isDefined(repositoryTypes[typeIndex])) {
+                return repositoryTypes[typeIndex][key];
+            }
+        };
     }
 
     angular

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

@@ -22,7 +22,8 @@ angular.module('Bastion.repositories').factory('Repository',
                 removeContent: { method: 'PUT', params: { action: 'remove_content'}},
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 repositoryTypes: {method: 'GET', isArray: true, params: {id: 'repository_types'}},
-                republish: {method: 'PUT', params: { action: 'republish' }}
+                republish: {method: 'PUT', params: { action: 'republish' }},
+                remove: {method: 'DELETE', params: { 'remove_from_content_view_versions': true }}
             }
         );
 

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

@@ -99,6 +99,14 @@
             <span ng-hide="repository.url" translate>N/A</span>
           </td>
           <td bst-table-cell>
+            <span ng-repeat="content_type in genericContentTypesFor(repository.content_type)">
+              <div>
+                <a ui-sref="product.repository.manage-content.generic-content({contentTypeLabel: '{{content_type['pluralized_label']}}', productId: product.id, repositoryId: repository.id})">
+                  {{ repository.content_counts[content_type.label] }} {{ content_type.pluralized_name }}
+                </a>
+              </div>
+            </span>
+
             <span ng-show="repository.content_type == 'yum'">
               <div>
                 <a translate ui-sref="product.repository.manage-content.packages({productId: product.id, repositoryId: repository.id})">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js

@@ -28,9 +28,13 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
             $scope.editedInterval = false;
 
             function updateSyncPlan(syncPlan) {
-                var syncDate;
+                var syncDate, splitDates;
                 if (syncPlan['sync_date']) {
-                    syncDate = new Date(syncPlan['sync_date']);
+                    // Firefox doesn't work with new Date(2021-10-04 18:57:00 -0400)
+                    //Needs to be in format YYYY-MM-DDTHH:mm:ss.sssZ
+                    // see: https://262.ecma-international.org/5.1/#sec-15.9.1.15
+                    splitDates = syncPlan['sync_date'].split(' ');
+                    syncDate = new Date(splitDates[0] + 'T' + splitDates[1] + splitDates[2]);
                 } else {
                     syncDate = new Date();
                 }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -20,7 +20,7 @@
       <dt translate>Start Date</dt>
       <dd bst-edit-custom="syncPlan.syncDate"
           formatter="date"
-          formatter-options="'MMMM d, y, hh:mm a'"
+          formatter-options="'MMMM dd, y, hh:mm a'"
           on-save="save(syncPlan)"
           readonly="denied('edit_sync_plans', syncPlan)">
 

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

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

data/lib/katello/engine.rb

@@ -182,7 +182,6 @@ module Katello
       #Controller extensions
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
-      ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
       #Helper Extensions

data/lib/katello/permission_creator.rb

@@ -76,6 +76,7 @@ module Katello
                    'katello/api/v2/content_view_repositories' => [:show_all],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_components' => [:index, :show, :show_all],
+                   'katello/api/v2/debs' => [:index],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
@@ -115,7 +116,7 @@ module Katello
                          {
                            'katello/api/v2/content_views' => [:update, :remove_filters],
                            'katello/api/v2/content_view_versions' => [:update],
-                           'katello/api/v2/content_view_filters' => [:create, :update, :destroy],
+                           'katello/api/v2/content_view_filters' => [:create, :update, :destroy, :remove_filter_rules, :add_filter_rules],
                            'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update]
                          },
@@ -239,10 +240,10 @@ module Katello
                          {
                            'katello/products' => [:auto_complete, :auto_complete_search],
                            'katello/api/v2/products' => [:index, :show, :auto_complete_search],
-                           'katello/api/v2/repositories' => [:index, :show, :repository_types, :auto_complete_search, :cancel],
+                           'katello/api/v2/repositories' => [:index, :show, :repository_types, :content_types, :auto_complete_search, :cancel],
                            'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/srpms' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifest_lists' => [:index, :show, :auto_complete_search, :compare],

data/lib/katello/permissions/host_permissions.rb

@@ -58,6 +58,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_packages/index',
   'katello/api/v2/host_tracer/index',
   'katello/api/v2/host_tracer/resolve',
+  'katello/api/v2/host_tracer/auto_complete_search',
   'katello/remote_execution/new',
   'katello/remote_execution/create',
   'katello/api/v2/repository_sets/index',

data/lib/katello/permissions/organization_permissions.rb

@@ -14,7 +14,8 @@ Foreman::AccessControl.permission(:create_organizations).actions.concat [
 ]
 
 Foreman::AccessControl.permission(:edit_organizations).actions.concat [
-  'katello/api/v2/organizations/update'
+  'katello/api/v2/organizations/update',
+  'katello/api/v2/organizations/cdn_configuration'
 ]
 
 Foreman::AccessControl.permission(:destroy_organizations).actions.concat [

data/lib/katello/plugin.rb

@@ -170,6 +170,16 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false,
          :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::ANSIBLE_COLLECTION_TYPE) }
+
+    menu :top_menu,
+         :other_content_types,
+         :caption => N_('Other Content Types'),
+         :url => '/content',
+         :url_hash => {:controller => '/',
+                       :action => ''},
+         :engine => Katello::Engine,
+         :turbolinks => false,
+         :if => lambda { true }
   end
 
   menu :top_menu,
@@ -194,19 +204,10 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
-  menu :labs_menu,
-       :content_publication,
-       :url => '/labs/content_views',
-       :url_hash => {:controller => 'katello/api/v2/content_views',
-                     :action => 'index'},
-       :caption => N_('Content Views'),
-       :parent => :lab_features_menu,
-       :turbolinks => false
-
   extend_template_helpers Katello::KatelloUrlsHelper
   extend_template_helpers Katello::Concerns::BaseTemplateScopeExtensions
 
-  register_global_js_file 'fills'
+  register_global_js_file 'global'
 
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
@@ -250,7 +251,7 @@ Foreman::Plugin.register :katello do
     context.add_pagelet :main_tabs,
       :name => _("Content"),
       :partial => "foreman/smart_proxies/content_tab",
-      :onlyif => proc { |proxy| proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) || proxy.has_feature?(SmartProxy::PULP3_FEATURE) }
+      :onlyif => proc { |proxy| proxy.pulp_mirror? }
     context.add_pagelet :details_content,
       :name => _("Content Sync"),
       :partial => "foreman/smart_proxies/content_sync",
@@ -312,10 +313,13 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
+    RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                     :description => N_("Perform a module stream action via Katello interface"),
                                     :provided_inputs => ['action', 'module_spec', 'options'])
     allowed_template_helpers :errata
+
+    RemoteExecutionProvider.singleton_class.prepend(Katello::Concerns::RemoteExecutionProviderExtensions)
   end
 
   tests_to_skip("AccessPermissionsTest" => [

data/lib/katello/repository_types/ansible_collection.rb

@@ -5,5 +5,17 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::ANSIBLE_COLLECTIO
   pulp3_api_class Katello::Pulp3::Api::AnsibleCollection
   pulp3_plugin 'ansible'
 
-  content_type Katello::AnsibleCollection, :pulp3_service_class => ::Katello::Pulp3::AnsibleCollection, :user_removable => true
+  client_module_class PulpAnsibleClient
+  api_class PulpAnsibleClient::ApiClient
+  configuration_class PulpAnsibleClient::Configuration
+  remote_class PulpAnsibleClient::AnsibleCollectionRemote
+  remotes_api_class PulpAnsibleClient::RemotesCollectionApi
+  repository_versions_api_class PulpAnsibleClient::RepositoriesAnsibleVersionsApi
+  repositories_api_class PulpAnsibleClient::RepositoriesAnsibleApi
+  distributions_api_class PulpAnsibleClient::DistributionsAnsibleApi
+  distribution_class PulpAnsibleClient::AnsibleAnsibleDistribution
+  repo_sync_url_class PulpAnsibleClient::AnsibleRepositorySyncURL
+
+  content_type Katello::AnsibleCollection, :pulp3_service_class => ::Katello::Pulp3::AnsibleCollection, :user_removable => true, generic_browser: true
+  default_managed_content_type :ansible_collections
 end

data/lib/katello/repository_types/deb.rb

@@ -5,6 +5,19 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   pulp3_plugin 'deb'
   prevent_unneeded_metadata_publish
 
+  client_module_class PulpDebClient
+  api_class PulpDebClient::ApiClient
+  configuration_class PulpDebClient::Configuration
+  remote_class PulpDebClient::DebAptRemote
+  remotes_api_class PulpDebClient::RemotesAptApi
+  repository_versions_api_class PulpDebClient::RepositoriesAptVersionsApi
+  repositories_api_class PulpDebClient::RepositoriesAptApi
+  distributions_api_class PulpDebClient::DistributionsAptApi
+  distribution_class PulpDebClient::DebAptDistribution
+  publication_class PulpDebClient::DebAptPublication
+  publications_api_class PulpDebClient::PublicationsAptApi
+  repo_sync_url_class PulpDebClient::RepositorySyncURL
+
   default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,
     :pulp2_service_class => ::Katello::Pulp::Deb,

data/lib/katello/repository_types/docker.rb

@@ -8,6 +8,17 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
 
   set_unique_content_per_repo
 
+  client_module_class PulpContainerClient
+  api_class PulpContainerClient::ApiClient
+  configuration_class PulpContainerClient::Configuration
+  remote_class PulpContainerClient::ContainerContainerRemote
+  remotes_api_class PulpContainerClient::RemotesContainerApi
+  repository_versions_api_class PulpContainerClient::RepositoriesContainerVersionsApi
+  repositories_api_class PulpContainerClient::RepositoriesContainerApi
+  distributions_api_class PulpContainerClient::DistributionsContainerApi
+  distribution_class PulpContainerClient::ContainerContainerDistribution
+  repo_sync_url_class PulpContainerClient::RepositorySyncURL
+
   content_type Katello::DockerManifest,
                :priority => 1,
                :pulp2_service_class => ::Katello::Pulp::DockerManifest,
@@ -21,7 +32,8 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   content_type Katello::DockerTag,
                :priority => 3,
                :pulp2_service_class => ::Katello::Pulp::DockerTag,
-               :pulp3_service_class => ::Katello::Pulp3::DockerTag
+               :pulp3_service_class => ::Katello::Pulp3::DockerTag,
+               :primary_content => true
   content_type Katello::DockerBlob,
                :priority => 4,
                :pulp2_service_class => ::Katello::Pulp::DockerBlob,

data/lib/katello/repository_types/file.rb

@@ -5,6 +5,19 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   pulp3_api_class Katello::Pulp3::Api::File
   pulp3_plugin 'file'
 
+  client_module_class PulpFileClient
+  api_class PulpFileClient::ApiClient
+  configuration_class PulpFileClient::Configuration
+  remote_class PulpFileClient::FileFileRemote
+  remotes_api_class PulpFileClient::RemotesFileApi
+  repository_versions_api_class PulpFileClient::RepositoriesFileVersionsApi
+  repositories_api_class PulpFileClient::RepositoriesFileApi
+  distributions_api_class PulpFileClient::DistributionsFileApi
+  distribution_class PulpFileClient::FileFileDistribution
+  publication_class PulpFileClient::FileFilePublication
+  publications_api_class PulpFileClient::PublicationsFileApi
+  repo_sync_url_class PulpFileClient::RepositorySyncURL
+
   content_type Katello::FileUnit,
                :pulp2_service_class => ::Katello::Pulp::FileUnit,
                :pulp3_service_class => ::Katello::Pulp3::FileUnit,

data/lib/katello/repository_types/ostree.rb

@@ -1,5 +1,49 @@
-Katello::RepositoryTypeManager.register(::Katello::Repository::OSTREE_TYPE) do
-  service_class Katello::Pulp::Repository::Ostree
-  default_managed_content_type Katello::OstreeBranch::CONTENT_TYPE
-  content_type Katello::OstreeBranch, :pulp2_service_class => ::Katello::Pulp::OstreeBranch, :removable => true, :uploadable => true
+require 'pulp_ostree_client'
+
+Katello::RepositoryTypeManager.register('ostree') do
+  allow_creation_by_user true
+  pulp3_service_class Katello::Pulp3::Repository::Generic
+  pulp3_api_class Katello::Pulp3::Api::Generic
+  pulp3_plugin 'ostree'
+  pulp3_skip_publication true
+
+  client_module_class PulpOstreeClient
+  api_class PulpOstreeClient::ApiClient
+  configuration_class PulpOstreeClient::Configuration
+  remote_class PulpOstreeClient::OstreeOstreeRemote
+  remotes_api_class PulpOstreeClient::RemotesOstreeApi
+  repositories_api_class PulpOstreeClient::RepositoriesOstreeApi
+  repository_versions_api_class PulpOstreeClient::RepositoriesOstreeVersionsApi
+  distributions_api_class PulpOstreeClient::DistributionsOstreeApi
+  distribution_class PulpOstreeClient::OstreeOstreeDistribution
+  repo_sync_url_class PulpOstreeClient::RepositorySyncURL
+
+  url_description N_("URL of an OSTree repository.")
+
+  generic_content_type 'ostree_ref',
+                       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["version"] }
+
+  import_attribute :ref, :content_type => 'ostree_ref',
+                        :api_param => :ostree_ref,
+                        :description => "OSTree ref branch that holds the reference to the last commit",
+                        :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",
+                        :type => String,
+                        :required => true
+
+  default_managed_content_type :ostree_ref
 end