foreman_scc_manager 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d2510abbdbe51fef59bba613502fb02ef1fe14eeb441f0bee716b17e2eba8d
-  data.tar.gz: c61b9f852d58033c290204508d0d4653e5379c6c8b73e6d5b58d026ea485b0f0
+  metadata.gz: cf29760fbadb5ab05822159701061bb43f6fce7a94ada64681af0defe0e8056b
+  data.tar.gz: 29e94a2c06159687fe610ff3e0961f3062c1f507be5ba58efdc2487e67be998c
 SHA512:
-  metadata.gz: d3ce92fbe191d0aaa6f10d0015ed4a3e3320892d1f45a519a965cdbd63a93e49a0fe6918fcc1b7cfb4618b8a8fc016349bfbceba5825a93ca5400dce5dd18e03
-  data.tar.gz: a48593aa198df8fbc5b4c88a2654facb7dc1f77f80373d3cf7a03fa46e84bd5f02af338af0a0e1dd2968da7e7afa6e44548f992e51d1ece7a0a82fa05922f0d9
+  metadata.gz: 0b2624ad1fe80b4200c892c9988c021cf91033879003abb5074ebd3c21bb0481d8ccdf3da86e5d5a11ae354c46540e3160e289bafe3355b522bfe239bb9be264
+  data.tar.gz: c8446acc052cf2c38147093a26024a51c2e0da6abe9712dccb6e786eba50db6d7fba85acf4c685f423d8b9e789c75e1899bbba0fcf005642b76c7d793a94be8c

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.theforeman.org/nightly/Managing_Content/index-katello.html#Managing_SUSE_Content_content-management)
 
 ## 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,26 @@ class SccAccount < ApplicationRecord
     end
     items_to_invalidate
   end
+
+  def self.download_policy_selection_values
+    names = {
+      ::Katello::RootRepository::DOWNLOAD_ON_DEMAND => _('On Demand'),
+      ::Katello::RootRepository::DOWNLOAD_IMMEDIATE => _('Immediate')
+    }
+
+    ::Katello::RootRepository::DOWNLOAD_POLICIES.map do |p|
+      [names.fetch(p, p), p]
+    end
+  end
+
+  def self.mirroring_policy_selection_values
+    names = {
+      ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE => _('Additive'),
+      ::Katello::RootRepository::MIRRORING_POLICY_CONTENT => _('Content Only')
+    }
+
+    ::Katello::RootRepository::MIRRORING_POLICIES.map do |p|
+      [names.fetch(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/20210713092440_add_permissions.rb

@@ -5,9 +5,9 @@ class AddPermissions < ActiveRecord::Migration[6.0]
   ].freeze
 
   def up
-    Permission.create!(:name => 'test_connection_scc_accounts', :resource_type => 'SccAccount')
+    Permission.find_or_create_by!(:name => 'test_connection_scc_accounts', :resource_type => 'SccAccount')
     PRODUCT_PERMISSION_NAMES.each do |p|
-      Permission.create!(:name => p, :resource_type => SccProduct)
+      Permission.find_or_create_by!(:name => p, :resource_type => 'SccProduct')
     end
   end
 

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.2.0'.freeze
 end

data/locale/Makefile

@@ -6,8 +6,8 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_scc_manager
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
 POFILES = $(shell find . -name '$(DOMAIN).po')
@@ -41,7 +41,10 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-pull: $(EDITFILES)
+tx-new:
+	tx pull --minimum-perc 50 --all
+
+tx-pull: tx-new $(EDITFILES)
 	tx pull -f
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
@@ -52,7 +55,9 @@ tx-update: tx-pull
 	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
 	@echo
 
-mo-files: $(MOFILES)
+build-mo-files: $(MOFILES)
+
+mo-files: build-mo-files
 	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo

data/locale/action_names.rb

@@ -1,5 +1,88 @@
-_("Subscribe SCC Product")
-_("Sync SUSE subscriptions")
-_("Update SUSE repositories")
-_("Sync SUSE subscriptions (Products)")
+# Autogenerated!
+_("Import")
+_("Export Repository")
+_("Export Library")
+_("Generate host applicability")
+_("Bulk generate applicability for hosts")
+_("Generate repository applicability")
+_("Synchronize smart proxy")
+_("Sync capsule")
+_("Update CDN Configuration")
+_("Update")
+_("Delete")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
+_("Syncable export")
+_("Export")
+_("Copy version units to library")
+_("Create Syncable Export History")
+_("Create Import History")
+_("Create")
+_("Delete Activation Key")
+_("Create Export History")
+_("Agent action")
+_("Create Alternate Content Source")
+_("Destroy Alternate Content Source")
+_("Refresh Alternate Content Source")
+_("Update Alternate Content Source")
+_("Action with sub plans")
+_("Abstract")
+_("Remove from Environment")
+_("Promote")
+_("Promotion to Environment")
+_("Publish")
+_("Remove Versions and Associations")
+_("Remove Version")
+_("Import Content View Version")
+_("Import Default Content View")
+_("Import Repository")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Delete Lifecycle Environment")
+_("Publish Lifecycle Environment Repositories")
+_("Attach subscriptions")
+_("Auto attach subscriptions")
+_("Destroy Content Host")
+_("Install Applicable Errata")
+_("Hypervisors")
+_("Hypervisors update")
+_("Remove subscriptions")
+_("Combined Profile Update")
+_("Update Content Overrides")
+_("Update for host")
+_("Update release version for host")
+_("Updating System Purpose for host")
+_("Package Profile Update")
+_("Destroy")
+_("Run Sync Plan:")
+_("Enable")
+_("Disable")
+_("Verify checksum")
+_("Create Package Group")
+_("Upload into")
+_("Update redhat repository")
+_("Update http proxy details")
+_("Update content urls")
+_("Discover")
+_("Synchronize")
+_("Remove Content")
+_("Instance update")
+_("Index package groups")
+_("Index module streams")
+_("Index errata")
+_("Index content")
+_("Filtered index content")
+_("Fetch pxe files")
+_("Delete Package Group")
+_("Update http proxy")
+_("Reindex subscriptions")
+_("Delete Product")
+_("Product Create")
 _("Sync SUSE subscriptions (Repositories)")
+_("Sync SUSE subscriptions (Products)")
+_("Update SUSE repositories")
+_("Sync SUSE subscriptions")
+_("Subscribe SCC Product")