foreman_scc_manager 1.8.6 → 1.8.7

data/locale/en/foreman_scc_manager.po

@@ -17,6 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+msgid "(WARNING: Please check your SUSE subscription)"
+msgstr ""
+
 msgid "Actions"
 msgstr ""
 
@@ -26,6 +29,9 @@ msgstr "Add SCC account"
 msgid "Add SUSE Customer Center Account"
 msgstr "Add SUSE Customer Center Account"
 
+msgid "Associated GPG key of scc_account"
+msgstr ""
+
 msgid "Base URL"
 msgstr "Base URL"
 
@@ -38,6 +44,12 @@ msgstr ""
 msgid "Cron expression is not valid!"
 msgstr ""
 
+msgid "Date and time relative to which the sync interval is run"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr ""
 
@@ -62,9 +74,6 @@ msgstr ""
 msgid "Interval not set correctly"
 msgstr ""
 
-msgid "Last Sync time of scc_account"
-msgstr ""
-
 msgid "Last synced"
 msgstr "Last synced"
 
@@ -86,6 +95,9 @@ msgstr ""
 msgid "No products selected."
 msgstr ""
 
+msgid "None"
+msgstr ""
+
 msgid "Password of scc_account"
 msgstr ""
 
@@ -182,6 +194,12 @@ msgstr ""
 msgid "Update scc_account"
 msgstr ""
 
+msgid "Use GPG key for SUSE products"
+msgstr ""
+
+msgid "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."
+msgstr ""
+
 msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
 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: 2020-03-02 13:47+0000\n"
-"PO-Revision-Date: 2020-03-02 13:47+0000\n"
+"POT-Creation-Date: 2021-03-02 07:16+0000\n"
+"PO-Revision-Date: 2021-03-02 07:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,17 +31,17 @@ msgid "Name of the scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:33
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:64
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:65
 msgid "Login id of scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:34
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:65
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:66
 msgid "Password of scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:35
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:66
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:67
 msgid "URL of SUSE for scc_account"
 msgstr ""
 
@@ -50,31 +50,35 @@ msgid "Interval for syncing scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:37
-msgid "Last Sync time of scc_account"
+msgid "Date and time relative to which the sync interval is run"
+msgstr ""
+
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:38
+msgid "Associated GPG key of scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:41
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:42
 msgid "Create an scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:48
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:49
 msgid "Update scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:55
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:56
 msgid "Delete scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:61
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:62
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:63
 msgid "Test connection for scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:89
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:90
 msgid "Sync scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:103
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:104
 msgid "Bulk subscription of scc_products for scc_account"
 msgstr ""
 
@@ -90,25 +94,25 @@ msgstr ""
 msgid "Subscribe product"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:64
+#: ../app/controllers/scc_accounts_controller.rb:71
 msgid "Sync task started."
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:66
-#: ../app/controllers/scc_accounts_controller.rb:86
+#: ../app/controllers/scc_accounts_controller.rb:73
+#: ../app/controllers/scc_accounts_controller.rb:93
 msgid "Failed to add task to queue: %s"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:68
-#: ../app/controllers/scc_accounts_controller.rb:88
+#: ../app/controllers/scc_accounts_controller.rb:75
+#: ../app/controllers/scc_accounts_controller.rb:95
 msgid "Lock on SCC account already taken: %s"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:81
+#: ../app/controllers/scc_accounts_controller.rb:88
 msgid "Task to subscribe products started."
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:83
+#: ../app/controllers/scc_accounts_controller.rb:90
 msgid "No products selected."
 msgstr ""
 
@@ -116,11 +120,11 @@ msgstr ""
 msgid "Product already subscribed!"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:68
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:46 action_names.rb:5
 msgid "Subscribe SCC Product"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:69
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:4
 msgid "Sync SUSE subscriptions"
 msgstr ""
 
@@ -133,31 +137,31 @@ msgid "Unknown"
 msgstr ""
 
 #: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33
-#: action_names.rb:70
+#: action_names.rb:9
 msgid "Update SUSE repositories"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:71
+#: ../app/lib/actions/scc_manager/sync_products.rb:36 action_names.rb:3
 msgid "Sync SUSE subscriptions (Products)"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:72
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:34 action_names.rb:2
 msgid "Sync SUSE subscriptions (Repositories)"
 msgstr ""
 
-#: ../app/models/scc_account.rb:59
+#: ../app/models/scc_account.rb:62
 msgid "never synced"
 msgstr ""
 
-#: ../app/models/scc_account.rb:106
+#: ../app/models/scc_account.rb:109
 msgid "Interval cannot be nil"
 msgstr ""
 
-#: ../app/models/scc_account.rb:113
+#: ../app/models/scc_account.rb:116
 msgid "Interval not set correctly"
 msgstr ""
 
-#: ../app/models/scc_account.rb:118
+#: ../app/models/scc_account.rb:121
 msgid "Cron expression is not valid!"
 msgstr ""
 
@@ -170,41 +174,48 @@ msgstr ""
 msgid "SUSE Subscription: "
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:6
+#: ../app/views/scc_accounts/_form.html.erb:7
 msgid "SUSE Customer Center account"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:13
+#: ../app/views/scc_accounts/_form.html.erb:14
 msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:15
+#: ../app/views/scc_accounts/_form.html.erb:16
 msgid "Base URL"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
+#: ../app/views/scc_accounts/_form.html.erb:18
 msgid "Sync interval"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
+#: ../app/views/scc_accounts/_form.html.erb:18
 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:22
-msgid "Use GPG key for SUSE products"
+#: ../app/views/scc_accounts/_form.html.erb:19
+msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:22
-msgid "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."
+#: ../app/views/scc_accounts/_form.html.erb:23
+msgid "None"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:18
-msgid "Sync Date"
+#: ../app/views/scc_accounts/_form.html.erb:24
+msgid "Use GPG key for SUSE products"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:25
+#: ../app/views/scc_accounts/_form.html.erb:26
+msgid ""
+"Use this setting if you want to automatically add a GPG key to your SUSE produ"
+"cts upon subscription. You can change this setting in the 'Content' > 'Product"
+"s' menu, later."
+msgstr ""
+
+#: ../app/views/scc_accounts/_form.html.erb:31
 msgid "Test Connection"
 msgstr ""
 
@@ -248,15 +259,23 @@ msgstr ""
 msgid "Add SUSE Customer Center Account"
 msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:25
+#: ../app/views/scc_accounts/show.html.erb:1
+msgid "Product Selection for Account %s"
+msgstr ""
+
+#: ../app/views/scc_accounts/show.html.erb:17
+msgid "(WARNING: Please check your SUSE subscription)"
+msgstr ""
+
+#: ../app/views/scc_accounts/show.html.erb:33
 msgid "SUSE Customer Center"
 msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:36
+#: ../app/views/scc_accounts/show.html.erb:44
 msgid "Please sync your SUSE subscriptions first."
 msgstr ""
 
-#: ../lib/foreman_scc_manager/engine.rb:66
+#: ../lib/foreman_scc_manager/engine.rb:77
 msgid "SUSE Subscriptions"
 msgstr ""
 

data/test/fixtures/models/scc_products.yml

@@ -9,6 +9,7 @@ one:
   friendly_name: number one
   description: "<p> lorem ipsum dolor sit amet </p>"
   product_type: base
+  subscription_valid: nil
 
 two:
   scc_account_id: test_account1
@@ -19,6 +20,7 @@ two:
   friendly_name: number two
   description: "<p> lorem ipsum dolor sit amet </p><p> lorem lorem lorem </p>"
   product_type: extras
+  subscription_valid: true
 
 three:
   scc_account_id: test_account1
@@ -29,6 +31,7 @@ three:
   friendly_name: number three
   description: lorem ipsum dolor sit amet
   product_type: base
+  subscription_valid: nil
 
 # create a couple of products as scc_extensions
 <% 1.upto(10) do |i| %>
@@ -41,5 +44,6 @@ p_extension_<%= i %>:
   friendly_name: number <%= i%> 
   description: lorem ipsum dolor sit amet
   product_type: extension
+  subscription_valid: nil
 <% end %>
 

data/test/models/scc_account_test.rb

@@ -102,6 +102,12 @@ class SccAccountUpdateProductsTest < ActiveSupport::TestCase
     assert_equal @test_product.pretty_name, @updated_product.pretty_name
     assert_equal @test_product.pretty_description, @updated_product.description
     assert_equal @test_product.pretty_description, @updated_product.pretty_description
+
+    assert @updated_product.subscription_valid
+    @invalid_products = @account.scc_products.where.not(scc_id: scc_products(:one).scc_id)
+    @invalid_products.each do |ip|
+      assert_not ip.subscription_valid
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -155,6 +155,9 @@ files:
 - db/migrate/20190417202427_add_recurring_sync.foreman_scc_manager.rb
 - db/migrate/20200520281300_fix_scc_permissions.rb
 - db/migrate/20201119084201_add_gpg_key_to_scc_account.rb
+- db/migrate/20210205082733_add_subscription_valid_to_scc_products_and_repos.rb
+- db/migrate/20210210104407_add_root_repository_id_to_scc_repository.rb
+- db/migrate/20210224095050_connect_katello_root_repository_to_scc_repository.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -163,9 +166,13 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_scc_manager.mo
+- locale/de/foreman_scc_manager.edit.po
 - locale/de/foreman_scc_manager.po
+- locale/de/foreman_scc_manager.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_scc_manager.mo
+- locale/en/foreman_scc_manager.edit.po
 - locale/en/foreman_scc_manager.po
+- locale/en/foreman_scc_manager.po.time_stamp
 - locale/foreman_scc_manager.pot
 - locale/gemspec.rb
 - test/controllers/api/v2/scc_accounts_test.rb