foreman_virt_who_configure 0.5.18 → 0.5.20

data/locale/zh_TW/foreman_virt_who_configure.po

@@ -36,12 +36,6 @@ msgstr ""
 msgid "A plugin to make virt-who configuration easy"
 msgstr ""
 
-msgid "Abstract"
-msgstr ""
-
-msgid "Abstract async task"
-msgstr "抽象 async task"
-
 msgid "Account name by which virt-who is to connect to Nutanix AHV."
 msgstr ""
 
@@ -60,39 +54,18 @@ msgstr ""
 msgid "Account password by which virt-who is to connect to the hypervisor instance."
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr "有子計畫的動作"
-
 msgid "Actions"
 msgstr "行動"
 
-msgid "Agent action"
-msgstr ""
-
 msgid "Applicable only for esx provider type. Hosts which parent (usually ComputeResource) name is specified in comma-separated list in this option will <b>NOT</b> be reported. Wildcards and regular expressions are supported, multiple records must be separated by comma. Put the value into the double-quotes if it contains special characters like comma. All new line characters will be removed in resulting configuration file, white spaces are removed from beginning and end."
 msgstr ""
 
 msgid "Applicable only for esx provider type. Only hosts which parent (usually ComputeResource) name is specified in comma-separated list in this option will be reported. Wildcards and regular expressions are supported, multiple records must be separated by comma. Put the value into the double-quotes if it contains special characters like comma. All new line characters will be removed in resulting configuration file, white spaces are removed from beginning and end."
 msgstr ""
 
-msgid "Attach subscriptions"
-msgstr "連接訂閱服務"
-
-msgid "Auto attach subscriptions"
-msgstr "自動連接訂閱"
-
 msgid "Blacklist"
 msgstr ""
 
-msgid "Bulk generate applicability for hosts"
-msgstr ""
-
-msgid "Check for long running tasks"
-msgstr ""
-
-msgid "Combined Profile Update"
-msgstr ""
-
 msgid "Configs"
 msgstr "配置"
 
@@ -135,78 +108,30 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-msgid "Copy version units to library"
-msgstr ""
-
 msgid "Count"
 msgstr "計數"
 
-msgid "Create"
-msgstr "建立"
-
-msgid "Create Alternate Content Source"
-msgstr ""
-
 msgid "Create Config"
 msgstr ""
 
-msgid "Create Export History"
-msgstr ""
-
-msgid "Create Import History"
-msgstr ""
-
-msgid "Create Syncable Export History"
-msgstr ""
-
 msgid "Create a virt-who configuration"
 msgstr ""
 
-msgid "Delete"
-msgstr "刪除"
-
-msgid "Delete Activation Key"
-msgstr "刪除啟動金鑰"
-
-msgid "Delete Lifecycle Environment"
-msgstr "刪除生命週期環境"
-
-msgid "Delete Product"
-msgstr "刪除產品"
-
 msgid "Delete a virt-who configuration"
 msgstr ""
 
 msgid "Delete virt-who configuration %s?"
 msgstr ""
 
-msgid "Deliver notifications about long running tasks"
-msgstr ""
-
 msgid "Deploy"
 msgstr ""
 
-msgid "Destroy"
-msgstr "銷毀"
-
-msgid "Destroy Alternate Content Source"
-msgstr ""
-
-msgid "Destroy Content Host"
-msgstr "銷毀內容主機"
-
 msgid "Details"
 msgstr "詳細資料"
 
 msgid "Different debug value can't be set per hypervisor, therefore it will affect all other deployed configurations on the host on which this configuration will be deployed."
 msgstr ""
 
-msgid "Disable"
-msgstr "停用"
-
-msgid "Discover"
-msgstr "尋找"
-
 msgid "Download the script"
 msgstr ""
 
@@ -216,9 +141,6 @@ msgstr "編輯"
 msgid "Edit Virt-who Config"
 msgstr ""
 
-msgid "Enable"
-msgstr "啟用"
-
 msgid "Enable AHV debug"
 msgstr ""
 
@@ -228,9 +150,6 @@ msgstr ""
 msgid "Enable debugging output?"
 msgstr ""
 
-msgid "Errata mail"
-msgstr "勘誤郵件"
-
 msgid "Every 12 hours"
 msgstr ""
 
@@ -267,18 +186,6 @@ msgstr ""
 msgid "Exclude hosts which cluster ID is specified in comma-separated list in this option will <b>NOT</b> be reported. PowerCLI command to find the domain names in VMware <code>Get-Cluster “ClusterName” | Select ID</code>. Wildcards and regular expressions are supported, multiple records must be separated by comma. Put the value into the double-quotes if it contains special characters like comma. All new line characters will be removed in resulting configuration file, white spaces are removed from beginning and end."
 msgstr ""
 
-msgid "Export"
-msgstr "匯出"
-
-msgid "Export Library"
-msgstr ""
-
-msgid "Export Repository"
-msgstr ""
-
-msgid "Fetch pxe files"
-msgstr ""
-
 msgid "Filter Hosts"
 msgstr ""
 
@@ -288,9 +195,6 @@ msgstr ""
 msgid "Filter hosts"
 msgstr ""
 
-msgid "Filtered index content"
-msgstr "已篩選的索引內容"
-
 msgid "Filtering"
 msgstr ""
 
@@ -306,12 +210,6 @@ msgstr ""
 msgid "General information"
 msgstr ""
 
-msgid "Generate host applicability"
-msgstr ""
-
-msgid "Generate repository applicability"
-msgstr ""
-
 msgid "HTTP Proxy"
 msgstr "HTTP 代理"
 
@@ -363,12 +261,6 @@ msgstr ""
 msgid "Hypervisor whitelist, applicable only when filtering mode is set to 1. Wildcards and regular expressions are supported, multiple records must be separated by comma."
 msgstr ""
 
-msgid "Hypervisors"
-msgstr "Hypervisor"
-
-msgid "Hypervisors update"
-msgstr "Hypervisor 更新"
-
 msgid "If you run a hybrid environment, with virtual machines running Red Hat Enterprise Linux and other operating systems, you may want to limit the scope of virt-who’s access to hosts. For example, if some hypervisors host only Microsoft Windows Server instances, there is no benefit in having those hypervisors reported by the virt-who agent."
 msgstr ""
 
@@ -381,48 +273,6 @@ msgstr ""
 msgid "Ignore proxy. A comma-separated list of hostnames or domains or ip addresses to ignore proxy settings for. Optionally this may be set to * to bypass proxy settings for all hostnames domains or ip addresses."
 msgstr ""
 
-msgid "Import"
-msgstr "匯入"
-
-msgid "Import Content View Version"
-msgstr ""
-
-msgid "Import Default Content View"
-msgstr ""
-
-msgid "Import Puppet classes"
-msgstr "匯入 Puppet 類別"
-
-msgid "Import Repository"
-msgstr ""
-
-msgid "Import facts"
-msgstr "匯入詳情"
-
-msgid "Incremental Update"
-msgstr "遞增更新"
-
-msgid "Incremental Update of  Content View Version(s) "
-msgstr ""
-
-msgid "Index content"
-msgstr "索引內容"
-
-msgid "Index errata"
-msgstr "索引勘誤"
-
-msgid "Index module streams"
-msgstr ""
-
-msgid "Index package groups"
-msgstr "為套件群組製作索引"
-
-msgid "Install Applicable Errata"
-msgstr "安裝可套用的勘誤"
-
-msgid "Instance update"
-msgstr ""
-
 msgid "Interval"
 msgstr ""
 
@@ -513,9 +363,6 @@ msgstr "擁有者"
 msgid "Owner was not provided"
 msgstr ""
 
-msgid "Package Profile Update"
-msgstr "套件設定檔更新"
-
 msgid "Path to kubeconfig file"
 msgstr ""
 
@@ -528,54 +375,9 @@ msgstr ""
 msgid "Prism Flavor"
 msgstr ""
 
-msgid "Product Create"
-msgstr "產品建立"
-
-msgid "Promote"
-msgstr "Promote"
-
-msgid "Promotion to Environment"
-msgstr ""
-
-msgid "Publish"
-msgstr "發行"
-
-msgid "Publish Lifecycle Environment Repositories"
-msgstr ""
-
-msgid "Refresh Alternate Content Source"
-msgstr ""
-
-msgid "Reindex subscriptions"
-msgstr "重新索引訂閱服務"
-
-msgid "Remove Content"
-msgstr "移除內容"
-
-msgid "Remove Version"
-msgstr "移除版本"
-
-msgid "Remove Versions and Associations"
-msgstr "移除版本與相聯項目"
-
-msgid "Remove from Environment"
-msgstr "從環境移除"
-
-msgid "Remove subscriptions"
-msgstr "移除訂閱服務"
-
 msgid "Renders a deploy script for the specified virt-who configuration"
 msgstr ""
 
-msgid "Report"
-msgstr "回報"
-
-msgid "Republish Version Repositories"
-msgstr ""
-
-msgid "Run Sync Plan:"
-msgstr ""
-
 msgid "Schedule"
 msgstr "排程"
 
@@ -602,18 +404,6 @@ msgstr "狀態"
 msgid "Success"
 msgstr "成功"
 
-msgid "Sync capsule"
-msgstr ""
-
-msgid "Syncable export"
-msgstr ""
-
-msgid "Synchronize"
-msgstr "同步"
-
-msgid "Synchronize smart proxy"
-msgstr ""
-
 msgid "The configuration was not deployed yet or the virt-who was unable to report the status"
 msgstr ""
 
@@ -656,54 +446,15 @@ msgstr ""
 msgid "Unlimited"
 msgstr "無限制"
 
-msgid "Update"
-msgstr "更新"
-
-msgid "Update Alternate Content Source"
-msgstr ""
-
-msgid "Update CDN Configuration"
-msgstr ""
-
-msgid "Update Content Overrides"
-msgstr ""
-
 msgid "Update a virt-who configuration"
 msgstr ""
 
-msgid "Update content urls"
-msgstr ""
-
-msgid "Update for host"
-msgstr "給主機的更新"
-
-msgid "Update http proxy"
-msgstr ""
-
-msgid "Update http proxy details"
-msgstr ""
-
-msgid "Update redhat repository"
-msgstr ""
-
-msgid "Update release version for host"
-msgstr ""
-
-msgid "Updating System Purpose for host"
-msgstr ""
-
-msgid "Upload into"
-msgstr "上傳入"
-
 msgid "Use either hammer command or the script below to deploy this configuration. Both require root privileges. Run one of them on the target host which has access to katello-host-tools repository and will run virt-who reporting, preferably Foreman host:"
 msgstr ""
 
 msgid "VMware vCenter server’s fully qualified host name or IP address."
 msgstr ""
 
-msgid "Verify checksum"
-msgstr ""
-
 msgid "Virt-who Configs Status"
 msgstr ""
 

data/test/factories/foreman_virt_who_configure_factories.rb

@@ -14,11 +14,11 @@ FactoryBot.define do
 
   trait :out_of_date do
     last_report_at { (1.minute.ago - 120.minutes).utc }
-    out_of_date_at { (1.minute.ago).utc }
+    out_of_date_at { 1.minute.ago.utc }
   end
 
   trait :ok do
-    last_report_at { (1.minute.ago).utc }
+    last_report_at { 1.minute.ago.utc }
     out_of_date_at { (1.minute.ago + 120.minutes).utc }
   end
 end

data/test/functional/api/v2/configs_controller_test.rb

@@ -3,19 +3,20 @@ require 'test_plugin_helper'
 class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController::TestCase
   setup do
     @http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://test.com")
-    @new_config = FactoryBot.create(:virt_who_config,
-                                 :name => 'my vmware',
-                                 :interval => 120,
-                                 :listing_mode => ForemanVirtWhoConfigure::Config::WHITELIST,
-                                 :whitelist => 'a,b',
-                                 :hypervisor_id => 'hostname',
-                                 :hypervisor_type => 'esx',
-                                 :hypervisor_server => "vmware.example.com",
-                                 :hypervisor_username => "root",
-                                 :debug => false,
-                                 :satellite_url => "foreman.example.com",
-                                 :http_proxy_id => @http_proxy.id,
-                                 :no_proxy => nil
+    @new_config = FactoryBot.create(
+      :virt_who_config,
+      :name => 'my vmware',
+      :interval => 120,
+      :listing_mode => ForemanVirtWhoConfigure::Config::WHITELIST,
+      :whitelist => 'a,b',
+      :hypervisor_id => 'hostname',
+      :hypervisor_type => 'esx',
+      :hypervisor_server => "vmware.example.com",
+      :hypervisor_username => "root",
+      :debug => false,
+      :satellite_url => "foreman.example.com",
+      :http_proxy_id => @http_proxy.id,
+      :no_proxy => nil
     )
     @out_of_date_config = FactoryBot.create(:virt_who_config, :out_of_date)
     @ok_config = FactoryBot.create(:virt_who_config, :ok)

data/test/unit/config_test.rb

@@ -11,20 +11,33 @@ module ForemanVirtWhoConfigure
     end
 
     describe 'config is created' do
-      let(:existing_config) { config.save; config }
+      let(:existing_config) do
+        config.save
+        config
+      end
 
       test 'config creates service user upon creation' do
         assert existing_config.service_user
         assert_equal "virt_who_reporter_#{config.id}", existing_config.service_user.username
       end
 
+      test 'multiple configs for same organization shares one service user' do
+        new_config = FactoryBot.create(:virt_who_config, organization: existing_config.organization, hypervisor_type: 'libvirt', hypervisor_server: 'libvirt.example.com')
+        assert_equal new_config.service_user.username, existing_config.service_user.username
+      end
+
+      test "multiple organizations don't share service user" do
+        new_config = FactoryBot.create(:virt_who_config)
+        refute_equal new_config.service_user.username, existing_config.service_user.username
+      end
+
       test 'config creates hidden user' do
         assert existing_config.service_user.user
         assert_equal existing_config.service_user.username, existing_config.service_user.user.login
         assert_kind_of ForemanVirtWhoConfigure::AuthSourceHiddenWithAuthentication, existing_config.service_user.user.auth_source
       end
 
-      test 'config deletes service user and user upon removal' do
+      test 'last config deletes service user and user upon removal' do
         service_user = existing_config.service_user
         user = service_user.user
         assert existing_config.destroy
@@ -35,6 +48,15 @@ module ForemanVirtWhoConfigure
           user.reload
         end
       end
+
+      test 'config removal does not delete service user and user when other reference exists' do
+        FactoryBot.create(:virt_who_config, organization: existing_config.organization)
+        service_user = existing_config.service_user
+        user = service_user.user
+        assert existing_config.destroy
+        assert service_user.reload
+        assert user.reload
+      end
     end
 
     describe 'listing mode' do
@@ -67,11 +89,6 @@ module ForemanVirtWhoConfigure
       let(:config_1) { FactoryBot.create(:virt_who_config) }
       let(:config_2) { FactoryBot.create(:virt_who_config, :organization => another_org) }
 
-      before do
-        # let is lazy
-        preload = config_1, config_2
-      end
-
       test '.for_organization does not scope on any organization for nil' do
         # useful for just passing Organization.current which can be nil
         assert_includes ForemanVirtWhoConfigure::Config.for_organization(nil), config_1
@@ -82,17 +99,12 @@ module ForemanVirtWhoConfigure
         assert_includes ForemanVirtWhoConfigure::Config.for_organization(another_org), config_2
         refute_includes ForemanVirtWhoConfigure::Config.for_organization(another_org), config_1
       end
-
     end
 
     describe 'statuses and expiration' do
       let(:out_of_date_config) { FactoryBot.create(:virt_who_config, :out_of_date) }
       let(:ok_config) { FactoryBot.create(:virt_who_config, :ok) }
       let(:unknown_config) { FactoryBot.create(:virt_who_config) }
-      before do
-        # let is lazy
-        preload = out_of_date_config, ok_config, unknown_config
-      end
 
       test 'scoped search definitions work correctly' do
         assert_equal [ok_config], ForemanVirtWhoConfigure::Config.search_for('status = ok')

data/test/unit/output_generator_test.rb

@@ -10,8 +10,7 @@ module ForemanVirtWhoConfigure
       test 'empty password is replaced by fake value so that virt-who runs in an non-interactive mode' do
         config.hypervisor_password = nil
         config.hypervisor_type = 'libvirt'
-        # (echo bGlidmlydF9mYWtlX3Bhc3N3b3Jk|base64 -d) = OutputGenerator::LIBVIRT_FAKE_PASSWORD
-	assert_includes output, 'virt-who-password --password $(echo bGlidmlydF9mYWtlX3Bhc3N3b3Jk|base64 -d)'
+        assert_includes output, 'virt-who-password --password $(echo bGlidmlydF9mYWtlX3Bhc3N3b3Jk|base64 -d)'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.20
 platform: ruby
 authors:
 - Foreman virt-who-configure team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -132,6 +132,7 @@ files:
 - app/views/foreman_virt_who_configure/configs/steps/_general_information_form.erb
 - app/views/foreman_virt_who_configure/configs/steps/_schedule_form.erb
 - app/views/foreman_virt_who_configure/configs/welcome.html.erb
+- config/database.yml.example
 - config/routes.rb
 - db/migrate/20170102152649_create_service_users.rb
 - db/migrate/20170102152650_create_configs.rb
@@ -149,12 +150,12 @@ files:
 - db/migrate/20210608100743_delete_rhevm_profiles.rb
 - db/migrate/20210910184516_add_ahv_to_config.rb
 - db/migrate/20230210152216_remove_ahv_update_interval_from_config.rb
+- db/migrate/20231024171433_add_organization_id_to_service_user.rb
 - lib/foreman_virt_who_configure.rb
 - lib/foreman_virt_who_configure/engine.rb
 - lib/foreman_virt_who_configure/version.rb
 - lib/tasks/foreman_virt_who_configure_tasks.rake
 - locale/Makefile
-- locale/action_names.rb
 - locale/bn/LC_MESSAGES/foreman_virt_who_configure.mo
 - locale/bn/foreman_virt_who_configure.po
 - locale/bn_IN/LC_MESSAGES/foreman_virt_who_configure.mo
@@ -239,7 +240,7 @@ homepage: https://github.com/theforeman/foreman_virt_who_configure
 licenses:
 - GPLv3
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -254,8 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A plugin to make virt-who configuration easy
 test_files:

data/locale/action_names.rb

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