foreman_scc_manager 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d2510abbdbe51fef59bba613502fb02ef1fe14eeb441f0bee716b17e2eba8d
-  data.tar.gz: c61b9f852d58033c290204508d0d4653e5379c6c8b73e6d5b58d026ea485b0f0
+  metadata.gz: 6946578ff8b15ec04a5c14a78e12107481d47d9f5093a4e1d2501bc79c4c4f94
+  data.tar.gz: f800326b64951b7909427f7fa7d126e6300550f5bee9afacbb394f83d5fe1cf7
 SHA512:
-  metadata.gz: d3ce92fbe191d0aaa6f10d0015ed4a3e3320892d1f45a519a965cdbd63a93e49a0fe6918fcc1b7cfb4618b8a8fc016349bfbceba5825a93ca5400dce5dd18e03
-  data.tar.gz: a48593aa198df8fbc5b4c88a2654facb7dc1f77f80373d3cf7a03fa46e84bd5f02af338af0a0e1dd2968da7e7afa6e44548f992e51d1ece7a0a82fa05922f0d9
+  metadata.gz: d90c05393fe090f811d6cfbb038dd2cb5e45f73ed1359e3bd172c422131a9acb53ac17c0e85c253f9a350462fa5a7954d767af01ffdb9baf3766fcae5acee014
+  data.tar.gz: acbbdc19ee139f505415d328fe51f463e2d249a82635b75750b73bfbbdd4fd3a84a32f465cac22c806d36b8044f6d07f14045ecb931830af58a39dac19ce94ee

data/README.md

@@ -11,7 +11,7 @@ Foreman plugin to sync SUSE Customer Center products and repositories into Katel
 This plugin installation is supported since Foreman 3.4 / Katello 4.6 by the foreman-installer, but only with the scenario Katello:
 
 ```sh
-foreman-install --scenario katello --enable-foreman-plugin-scc-manager
+foreman-installer --scenario katello --enable-foreman-plugin-scc-manager
 ```
 
 You can also install it manually:
@@ -26,7 +26,7 @@ foreman-installer
 
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
-| 3.5             | 4.5             | ~> 2.0.0       |
+| 3.3             | 4.5             | ~> 2.0.0       |
 | 3.1             | 4.3             | ~> 1.8.20\*    |
 | 3.0             | 4.2             | ~> 1.8.20      |
 | 2.5             | 4.1             | ~> 1.8.20      |
@@ -39,7 +39,7 @@ foreman-installer
 
 ## Documentation
 
-[Plugin documentation](https://docs.orcharhino.com/or/docs/sources/usage_guides/managing_sles_systems_guide.html#mssg_installing_the_scc_manager_plugin)
+[Plugin documentation](https://docs.orcharhino.com/or/docs/sources/guides/suse_linux_enterprise_server/managing_content/managing_suse_content.html)
 
 ## Hammer CLI Extension
 

data/app/controllers/api/v2/scc_accounts_controller.rb

@@ -34,6 +34,14 @@ module Api
           param :password, String, :required => true, :desc => N_('Password of scc_account')
           param :base_url, String, :required => false, :desc => N_('URL of SUSE for scc_account')
           param :interval, ['never', 'daily', 'weekly', 'monthly'], :desc => N_('Interval for syncing scc_account')
+          param :download_policy,
+                ::Katello::RootRepository::DOWNLOAD_POLICIES,
+                :required => false,
+                :desc => N_('The default download policy for repositories which were created using this SCC Account.')
+          param :mirroring_policy,
+                SccAccount::SCC_MIRRORING_POLICIES,
+                :required => false,
+                :desc => N_('The default mirroring policy for repositories which were created using this SCC Account.')
           param :sync_date, String, :desc => N_('Date and time relative to which the sync interval is run')
           param :katello_gpg_key_id, :identifier, :required => false, :desc => N_('Associated GPG key of scc_account')
         end

data/app/controllers/scc_accounts_controller.rb

@@ -170,6 +170,8 @@ class SccAccountsController < ApplicationController
       :password,
       :base_url,
       :interval,
+      :download_policy,
+      :mirroring_policy,
       :sync_date,
       :organization_id,
       :katello_gpg_key_id

data/app/lib/actions/scc_manager/subscribe_product.rb

@@ -53,7 +53,9 @@ module Actions
                                              :pretty_repo_name => repo.pretty_name,
                                              :url => repo.url,
                                              :token => repo.token,
-                                             :arch => arch)
+                                             :arch => arch,
+                                             :download_policy => scc_product.scc_account.download_policy,
+                                             :mirroring_policy => scc_product.scc_account.mirroring_policy)
             katello_repos[repo.id] = repo_create_action.output[:katello_root_repository_id]
           end
 
@@ -119,13 +121,9 @@ module Actions
                        :unprotected => unprotected,
                        :gpg_key => gpg_key,
                        :arch => input[:arch],
-                       :download_policy => Setting[:default_download_policy] }
+                       :download_policy => input[:download_policy],
+                       :mirroring_policy => input[:mirroring_policy] }
         repository = product.add_repo(repo_param)
-        if repository.has_attribute?('mirror_on_sync')
-          repository.mirror_on_sync = true
-        else
-          repository.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
-        end
         if repository.has_attribute?('upstream_authentication_token')
           repository.url = input[:url]
           repository.upstream_authentication_token = input[:token]

data/app/models/scc_account.rb

@@ -13,6 +13,11 @@ class SccAccount < ApplicationRecord
   MONTHLY = 'monthly'.freeze
   TYPES = [NEVER, DAILY, WEEKLY, MONTHLY].freeze
 
+  # MIRRORING_POLICY_COMPLETE doesn't work for suse repository because deltarpm metadata is not supported by pulp3
+  SCC_MIRRORING_POLICIES = ::Katello::RootRepository::MIRRORING_POLICIES.dup
+  SCC_MIRRORING_POLICIES.delete(::Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
+  SCC_MIRRORING_POLICIES.freeze
+
   self.include_root_in_json = false
 
   belongs_to :organization
@@ -29,6 +34,8 @@ class SccAccount < ApplicationRecord
   validates :password, presence: true
   validates :base_url, presence: true
   validates :interval, :inclusion => { :in => TYPES }, :allow_blank => false
+  validates :download_policy, :inclusion => { :in => ::Katello::RootRepository::DOWNLOAD_POLICIES }, :allow_blank => false
+  validates :mirroring_policy, :inclusion => { :in => SCC_MIRRORING_POLICIES }, :allow_blank => false
   validate :sync_date_is_valid_datetime
 
   after_initialize :init
@@ -278,4 +285,18 @@ class SccAccount < ApplicationRecord
     end
     items_to_invalidate
   end
+
+  def self.download_policy_selection_values
+    names = { 'on_demand' => _('On Demand'), 'immediate' => _('Immediate') }
+    ::Katello::RootRepository::DOWNLOAD_POLICIES.map do |p|
+      names.include?(p) ? [names[p], p] : [p, p]
+    end
+  end
+
+  def self.mirroring_policy_selection_values
+    names = { 'additive' => _('Additive'), 'mirror_content_only' => _('Content Only') }
+    SCC_MIRRORING_POLICIES.map do |p|
+      names.include?(p) ? [names[p], p] : [p, p]
+    end
+  end
 end

data/app/models/scc_product.rb

@@ -58,11 +58,8 @@ class SccProduct < ApplicationRecord
       gpg_key = new_product.gpg_key
       new_repo = new_product.add_repo(label, uniq_repo_name, repo.url, 'yum', unprotected, gpg_key)
       new_repo.arch = arch || 'noarch'
-      if new_repo.has_attribute?('mirror_on_sync')
-        new_repo.mirror_on_sync = true
-      else
-        new_repo.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
-      end
+      new_repo.mirroring_policy = scc_account.mirroring_policy
+      new_repo.download_policy = scc_account.download_policy
       if new_repo.has_attribute?('upstream_authentication_token')
         new_repo.upstream_authentication_token = repo.token
         new_repo.url = repo.url

data/app/views/api/v2/scc_accounts/main.json.rabl

@@ -2,4 +2,4 @@
 
 object @scc_account
 extends 'api/v2/scc_accounts/base'
-attributes :organization_id, :organization_name, :login, :base_url, :interval, :sync_date
+attributes :organization_id, :organization_name, :login, :base_url, :interval, :download_policy, :mirroring_policy, :sync_date

data/app/views/scc_accounts/_form.html.erb

@@ -19,11 +19,15 @@
         <%= field f, :sync_date, label: _('Sync Date') do
           f.datetime_field :sync_date, placeholder: Time.now
         end %>
-       <%= selectable_f f, :katello_gpg_key_id, @selectable_gpg_keys, {}, 
-                        { :include_blank => _("None"), 
-                          :label => _('Use GPG key for SUSE products'), 
-                          :selected => @scc_account.katello_gpg_key_id, 
+       <%= selectable_f f, :katello_gpg_key_id, @selectable_gpg_keys, {},
+                        { :include_blank => _("None"),
+                          :label => _('Use GPG key for SUSE products'),
+                          :selected => @scc_account.katello_gpg_key_id,
                           :help_block => _("Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later.") } %>
+        <%= selectable_f f, :download_policy, SccAccount::download_policy_selection_values,
+            { :label => _('Download Policy'), :help_block => _("The default download policy for repositories which were created using this SCC Account.") } %>
+        <%= selectable_f f, :mirroring_policy, SccAccount::mirroring_policy_selection_values,
+            { :label => _('Mirroring Policy'), :help_block => _("The default mirroring policy for repositories which were created using this SCC Account.") } %>
         <div class='clearfix'>
           <div class='form-group'>
             <div class='col-md-2'></div>

data/db/migrate/20221013214310_add_sync_options_to_scc_account.rb

@@ -0,0 +1,11 @@
+class AddSyncOptionsToSccAccount < ActiveRecord::Migration[5.2]
+  def change
+    add_column :scc_accounts, :download_policy, :string, default: ::Katello::RootRepository::DOWNLOAD_IMMEDIATE
+    add_column :scc_accounts, :mirroring_policy, :string, default: ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
+    SccAccount.all.each do |a|
+      a.download_policy = ::Katello::RootRepository::DOWNLOAD_IMMEDIATE
+      a.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
+      a.save!
+    end
+  end
+end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/test/controllers/scc_accounts_controller_test.rb

@@ -19,7 +19,7 @@ class SccAccountsControllerTest < ActionController::TestCase
           'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           'Authorization' => auth,
           'Host' => host,
-          'User-Agent' => "rest-client/2.1.0 (linux-gnu x86_64) ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+          'User-Agent' => "rest-client/2.1.0 (linux x86_64) ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
         }
       )
       .to_return(status: 200, body: '', headers: {})

data/test/fixtures/models/katello_root_repositories.yml

@@ -5,11 +5,7 @@ sles12_sp4_updates:
   product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
   url:                  www.not-valid.com
   download_policy:      immediate
-<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
   mirroring_policy:     "mirror_content_only"
-<% else %>
-  mirror_on_sync:       "true"
-<% end %>
   created_at:           <%= Time.now %>
   updated_at:           <%= Time.now %>
 
@@ -20,11 +16,7 @@ sles12_sp4_installer_updates:
   product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
   url:                  www.not-valid.com
   download_policy:      on_demand
-<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
   mirroring_policy:     "mirror_content_only"
-<% else %>
-  mirror_on_sync:       "true"
-<% end %>
   created_at:           <%= Time.now %>
   updated_at:           <%= Time.now %>
 
@@ -35,10 +27,6 @@ sles12_sp4_installer_updates_2:
   product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
   url:                  www.not-valid.com
   download_policy:      on_demand
-<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
   mirroring_policy:     "mirror_content_only"
-<% else %>
-  mirror_on_sync:       "true"
-<% end %>
   created_at:           <%= Time.now %>
   updated_at:           <%= Time.now %>

data/test/test_plugin_helper.rb

@@ -29,8 +29,6 @@ module FixtureTestCase
     fixtures(:all)
     FIXTURES = load_fixtures(ActiveRecord::Base)
 
-    Setting::Content.load_defaults
-
     User.current = ::User.unscoped.find(FIXTURES['users']['admin']['id'])
   end
 end
@@ -41,10 +39,6 @@ class ActiveSupport::TestCase
   include FixtureTestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
 
-  before do
-    Setting::Content.load_defaults
-  end
-
   def get_organization(org = nil)
     saved_user = User.current
     User.current = User.unscoped.find(users(:admin).id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -171,6 +171,7 @@ files:
 - db/migrate/20220429102717_populate_scc_katello_repositories.rb
 - db/migrate/20220513132652_populate_upstream_authentication_token.rb
 - db/migrate/20220531120722_add_product_category_to_scc_products.rb
+- db/migrate/20221013214310_add_sync_options_to_scc_account.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -248,27 +249,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
-- test/models/scc_product_test.rb
-- test/models/scc_account_test.rb
-- test/controllers/scc_accounts_controller_test.rb
-- test/controllers/api/v2/scc_accounts_test.rb
-- test/controllers/api/v2/scc_products_test.rb
-- test/fixtures/models/katello_root_repositories.yml
-- test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_repositories.yml
-- test/fixtures/files/data_products_page2.json
-- test/fixtures/files/data_products_page1.json
+- test/fixtures/models/scc_accounts.yml
+- test/fixtures/models/katello_root_repositories.yml
 - test/fixtures/files/data_subscriptions.json
+- test/fixtures/files/data_products_page1.json
 - test/fixtures/files/data_repositories.json
-- test/features/sync_test.rb
-- test/unit/foreman_scc_manager_test.rb
+- test/fixtures/files/data_products_page2.json
 - test/actions/sync_test.rb
-- test/support/fixtures_support.rb
+- test/features/sync_test.rb
 - test/factories/foreman_scc_manager_factories.rb
+- test/unit/foreman_scc_manager_test.rb
 - test/test_plugin_helper.rb
+- test/support/fixtures_support.rb
+- test/models/scc_account_test.rb
+- test/models/scc_product_test.rb
+- test/controllers/scc_accounts_controller_test.rb
+- test/controllers/api/v2/scc_products_test.rb
+- test/controllers/api/v2/scc_accounts_test.rb