foreman_scc_manager 1.8.0 → 1.8.5

data/locale/en/foreman_scc_manager.po

@@ -17,226 +17,173 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:15
-msgid "List all scc_accounts"
+msgid "Actions"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:24
-msgid "Show scc_account"
-msgstr ""
+msgid "Add SCC account"
+msgstr "Add SCC account"
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:32
-msgid "Name of the scc_account"
-msgstr ""
+msgid "Add SUSE Customer Center Account"
+msgstr "Add SUSE Customer Center Account"
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:33 ../app/controllers/api/v2/scc_accounts_controller.rb:64
-msgid "Login id of scc_account"
-msgstr ""
+msgid "Base URL"
+msgstr "Base URL"
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:34 ../app/controllers/api/v2/scc_accounts_controller.rb:65
-msgid "Password of scc_account"
+msgid "Bulk subscription of scc_products for scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:35 ../app/controllers/api/v2/scc_accounts_controller.rb:66
-msgid "URL of SUSE for scc_account"
+msgid "Create an scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:36
-msgid "Interval for syncing scc_account"
+msgid "Cron expression is not valid!"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:37
-msgid "Last Sync time of scc_account"
+msgid "Delete %s?"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:41
-msgid "Create an scc_account"
+msgid "Delete scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:48
-msgid "Update scc_account"
+msgid "Edit %s"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:55
-msgid "Delete scc_account"
-msgstr ""
+msgid "Failed to add task to queue: %s"
+msgstr "Failed to add task to queue: %s"
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:61 ../app/controllers/api/v2/scc_accounts_controller.rb:62
-msgid "Test connection for scc_account"
-msgstr ""
+msgid "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
+msgstr "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:89
-msgid "Sync scc_account"
+msgid "Interval cannot be nil"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:103
-msgid "Bulk subscription of scc_products for scc_account"
+msgid "Interval for syncing scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_products_controller.rb:15
-msgid "List all products for scc_account"
+msgid "Interval not set correctly"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_products_controller.rb:24
-msgid "Show an scc_account product"
+msgid "Last Sync time of scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_products_controller.rb:29
-msgid "Subscribe product"
-msgstr ""
+msgid "Last synced"
+msgstr "Last synced"
 
-#: ../app/controllers/scc_accounts_controller.rb:64
-msgid "Sync task started."
-msgstr "Sync task started."
+msgid "List all products for scc_account"
+msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:66 ../app/controllers/scc_accounts_controller.rb:86
-msgid "Failed to add task to queue: %s"
-msgstr "Failed to add task to queue: %s"
+msgid "List all scc_accounts"
+msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:68 ../app/controllers/scc_accounts_controller.rb:88
 msgid "Lock on SCC account already taken: %s"
 msgstr "Lock on SCC account already taken: %s"
 
-#: ../app/controllers/scc_accounts_controller.rb:81
-msgid "Task to subscribe products started."
+msgid "Login id of scc_account"
+msgstr ""
+
+msgid "Name of the scc_account"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:83
 msgid "No products selected."
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:5
+msgid "Password of scc_account"
+msgstr ""
+
+msgid "Please sync your SUSE subscriptions first."
+msgstr "Please sync your SUSE subscriptions first."
+
 msgid "Product already subscribed!"
 msgstr "Product already subscribed!"
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:21
-msgid "Subscribe SCC Product"
-msgstr "Subscribe SCC Product"
+msgid "Products"
+msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:22
-msgid "Sync SUSE subscriptions"
-msgstr "Sync SUSE subscriptions"
+msgid "SUSE Customer Center"
+msgstr "SUSE Customer Center"
 
-#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
-msgid "Update SUSE repositories %s"
-msgstr ""
+msgid "SUSE Customer Center account"
+msgstr "SUSE Customer Center account"
 
-#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
-msgid "Unknown"
+msgid "SUSE Subscription"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33 action_names.rb:71
-msgid "Update SUSE repositories"
+msgid "SUSE Subscription: "
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:72
-msgid "Sync SUSE subscriptions (Products)"
-msgstr "Sync SUSE subscriptions (Products)"
+msgid "SUSE Subscriptions"
+msgstr "SUSE Subscriptions"
 
-#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:73
-msgid "Sync SUSE subscriptions (Repositories)"
-msgstr "Sync SUSE subscriptions (Repositories)"
+msgid "SUSE subscriptions"
+msgstr "SUSE subscriptions"
 
-#: ../app/models/scc_account.rb:59
-msgid "never synced"
+msgid "Select products"
 msgstr ""
 
-#: ../app/models/scc_account.rb:106
-msgid "Interval cannot be nil"
+msgid "Show an scc_account product"
 msgstr ""
 
-#: ../app/models/scc_account.rb:113
-msgid "Interval not set correctly"
+msgid "Show scc_account"
 msgstr ""
 
-#: ../app/models/scc_account.rb:118
-msgid "Cron expression is not valid!"
-msgstr ""
+msgid "Subscribe SCC Product"
+msgstr "Subscribe SCC Product"
 
-#: ../app/models/scc_account_sync_plan_task_group.rb:5
-msgid "SUSE Subscription"
+msgid "Subscribe product"
 msgstr ""
 
-#: ../app/views/scc_account_sync_plan_task_groups/_scc_account_sync_plan_task_groups.html.erb:1
-msgid "SUSE Subscription: "
+msgid "Sync"
+msgstr "Sync"
+
+msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:6
-msgid "SUSE Customer Center account"
-msgstr "SUSE Customer Center account"
+msgid "Sync SUSE subscriptions"
+msgstr "Sync SUSE subscriptions"
 
-#: ../app/views/scc_accounts/_form.html.erb:13
-msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
-msgstr ""
+msgid "Sync SUSE subscriptions (Products)"
+msgstr "Sync SUSE subscriptions (Products)"
 
-#: ../app/views/scc_accounts/_form.html.erb:15
-msgid "Base URL"
-msgstr "Base URL"
+msgid "Sync SUSE subscriptions (Repositories)"
+msgstr "Sync SUSE subscriptions (Repositories)"
 
-#: ../app/views/scc_accounts/_form.html.erb:16
-msgid "Interval"
+msgid "Sync interval"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
-msgid "Sync Date"
+msgid "Sync scc_account"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:24
-msgid "Test Connection"
-msgstr "Test Connection"
+msgid "Sync task started."
+msgstr "Sync task started."
 
-#: ../app/views/scc_accounts/edit.html.erb:1
-msgid "Edit %s"
+msgid "Task to subscribe products started."
 msgstr ""
 
-#: ../app/views/scc_accounts/index.html.erb:2
-msgid "SUSE subscriptions"
-msgstr "SUSE subscriptions"
-
-#: ../app/views/scc_accounts/index.html.erb:3
-msgid "Add SCC account"
-msgstr "Add SCC account"
+msgid "Test Connection"
+msgstr "Test Connection"
 
-#: ../app/views/scc_accounts/index.html.erb:9
-msgid "Products"
+msgid "Test connection for scc_account"
 msgstr ""
 
-#: ../app/views/scc_accounts/index.html.erb:10
-msgid "Last synced"
-msgstr "Last synced"
-
-#: ../app/views/scc_accounts/index.html.erb:11
-msgid "Actions"
+msgid "The sync interval is used to periodically update the SCC authentication tokens of any imported products."
 msgstr ""
 
-#: ../app/views/scc_accounts/index.html.erb:24
-msgid "Select products"
+msgid "URL of SUSE for scc_account"
 msgstr ""
 
-#: ../app/views/scc_accounts/index.html.erb:25
-msgid "Sync"
-msgstr "Sync"
-
-#: ../app/views/scc_accounts/index.html.erb:28
-msgid "Delete %s?"
+msgid "Unknown"
 msgstr ""
 
-#: ../app/views/scc_accounts/new.html.erb:1
-msgid "Add SUSE Customer Center Account"
-msgstr "Add SUSE Customer Center Account"
+msgid "Update SUSE repositories"
+msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:25
-msgid "SUSE Customer Center"
-msgstr "SUSE Customer Center"
+msgid "Update SUSE repositories %s"
+msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:36
-msgid "Please sync your SUSE subscriptions first."
-msgstr "Please sync your SUSE subscriptions first."
+msgid "Update scc_account"
+msgstr ""
 
-#: ../lib/foreman_scc_manager/engine.rb:64
-msgid "SUSE Subscriptions"
-msgstr "SUSE Subscriptions"
+msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
+msgstr ""
 
-#: gemspec.rb:2
-msgid "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
-msgstr "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
+msgid "never synced"
+msgstr ""

data/locale/foreman_scc_manager.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_scc_manager 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-12 12:27+0000\n"
-"PO-Revision-Date: 2019-11-12 12:27+0000\n"
+"POT-Creation-Date: 2020-03-02 13:47+0000\n"
+"PO-Revision-Date: 2020-03-02 13:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -116,11 +116,11 @@ msgstr ""
 msgid "Product already subscribed!"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:21
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:68
 msgid "Subscribe SCC Product"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:22
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:69
 msgid "Sync SUSE subscriptions"
 msgstr ""
 
@@ -133,15 +133,15 @@ msgid "Unknown"
 msgstr ""
 
 #: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33
-#: action_names.rb:71
+#: action_names.rb:70
 msgid "Update SUSE repositories"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:72
+#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:71
 msgid "Sync SUSE subscriptions (Products)"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:73
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:72
 msgid "Sync SUSE subscriptions (Repositories)"
 msgstr ""
 
@@ -182,15 +182,21 @@ msgstr ""
 msgid "Base URL"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:16
-msgid "Interval"
+#: ../app/views/scc_accounts/_form.html.erb:17
+msgid "Sync interval"
 msgstr ""
 
 #: ../app/views/scc_accounts/_form.html.erb:17
+msgid ""
+"The sync interval is used to periodically update the SCC authentication tokens"
+" of any imported products."
+msgstr ""
+
+#: ../app/views/scc_accounts/_form.html.erb:18
 msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:24
+#: ../app/views/scc_accounts/_form.html.erb:25
 msgid "Test Connection"
 msgstr ""
 
@@ -242,7 +248,7 @@ msgstr ""
 msgid "Please sync your SUSE subscriptions first."
 msgstr ""
 
-#: ../lib/foreman_scc_manager/engine.rb:64
+#: ../lib/foreman_scc_manager/engine.rb:66
 msgid "SUSE Subscriptions"
 msgstr ""
 

data/test/fixtures/models/scc_products.yml

@@ -19,3 +19,27 @@ two:
   friendly_name: number two
   description: lorem ipsum dolor sit amet
   product_type: extras
+
+three:
+  scc_account_id: test_account1
+  scc_id: 333
+  name: three
+  version: 3
+  arch: x86_128
+  friendly_name: number three
+  description: lorem ipsum dolor sit amet
+  product_type: base
+
+# create a couple of products as scc_extensions
+<% 1.upto(10) do |i| %>
+p_extension_<%= i %>:
+  scc_account_id: test_account1
+  scc_id: <%= i %>
+  name: p_ext_<%= i%> 
+  version: 3
+  arch: x86_128
+  friendly_name: number <%= i%> 
+  description: lorem ipsum dolor sit amet
+  product_type: extension
+<% end %>
+

data/test/fixtures/models/scc_repositories.yml

@@ -0,0 +1,15 @@
+# repositories for testing the empty repository filtering
+<% 1.upto(8) do |i| %>
+repo_<%= i %>:
+  id: <%= i %>
+  scc_account_id: 1
+  scc_id: <%= 63 + i %>
+  name: SLE10-Debuginfo-Updates_<%= i %>
+  distro_target: sles_<%= i %>
+  description: SLE10-Debuginfo-Updates for sles-10-ppc_<%= i %>
+  url: https://updates.suse.com/repo/example_<%= i %>
+  token: token_<%= i %>
+  autorefresh: true
+  installer_updates: false
+<% end %>
+

data/test/models/scc_product_test.rb

@@ -17,7 +17,11 @@ end
 
 class SccProductSearchTest < ActiveSupport::TestCase
   test 'default ordered by name' do
-    assert_equal SccProduct.all.pluck(:name), ['one', 'two'].sort
+    product_names = ['one', 'two', 'three',
+                     'p_ext_1', 'p_ext_10', 'p_ext_2', 'p_ext_3',
+                     'p_ext_4', 'p_ext_5', 'p_ext_6', 'p_ext_7',
+                     'p_ext_8', 'p_ext_9']
+    assert_equal SccProduct.all.pluck(:name), product_names.sort
   end
 
   test 'search name' do
@@ -30,3 +34,54 @@ class SccProductSearchTest < ActiveSupport::TestCase
     assert_empty empty
   end
 end
+
+# These produt extension tests are pre-tests for the class ProductEmptyRepoAvailableTests.
+# They do not test any direct functionality of the plugin.
+class SccProductExtensionsTest < ActiveSupport::TestCase
+  def setup
+    @product_with_extensions = scc_products(:one)
+    @product_with_extensions.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+    @product_with_wrong_extensions = scc_products(:two)
+    @product_with_wrong_extensions.scc_extensions = [scc_products(:three)]
+    @product_without_extensions = scc_products(:three)
+  end
+
+  test 'check product extensions available' do
+    assert_equal @product_with_extensions.scc_extensions.count, 10
+    assert_not_empty @product_with_extensions.scc_extensions
+    assert_empty @product_without_extensions.scc_extensions
+  end
+
+  test 'product extension of correct type' do
+    assert_empty(@product_with_extensions.scc_extensions.reject { |p| p.product_type == 'extension' })
+    assert_not_empty(@product_with_wrong_extensions.scc_extensions.reject { |p| p.product_type == 'extension' })
+  end
+end
+
+class SccProductEmptyRepoAvailableTest < ActiveSupport::TestCase
+  def setup
+    @product_with_repos = scc_products(:one)
+    @product_with_repos.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+    @product_with_repos.scc_repositories = scc_repositories[0..2]
+    @product_with_repos.scc_extensions[1].scc_repositories = scc_repositories[3..4]
+    @product_with_repos.scc_extensions[2].scc_repositories = scc_repositories[5..7]
+  end
+
+  test 'products with empty repositories' do
+    products_with_repos = SccProduct.only_products_with_repos
+    assert_equal SccProduct.all.count { |prod| !prod.scc_repositories.empty? }, 3
+    assert_equal products_with_repos.count, 3
+  end
+end
+
+class SccProductNoRepoTest < ActiveSupport::TestCase
+  def setup
+    @product_with_repos = scc_products(:one)
+    @product_with_repos.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+  end
+
+  test 'products without any repositories' do
+    products_with_repos = SccProduct.only_products_with_repos
+    assert_empty products_with_repos
+  end
+end