foreman_virt_who_configure 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4530753c078a8fb15731435042afcbc985207fe160b96d242e04ecfc9d2078f2
-  data.tar.gz: 8013fca41321555482fe77a5203d7558b7828cfe7989208c4121686aa8c5dc2f
+  metadata.gz: 5653482998c6baa64d6021ec87387001da5da84b27b4765d468f7c94fb35904f
+  data.tar.gz: d0ac12b92107e1ad9ddf14b6addfebe7126914c99620e726188f8edad3593bb0
 SHA512:
-  metadata.gz: 45f214c29a0c4e76fb92834bb6f5a124fbac03788e5e235da28dfe798be08d7a36c121d50e7e135bc5fb78a93ba6616784965e76ec6a1ea46949207c0c99e706
-  data.tar.gz: 3f66cb56f3efa3e59c016e40d22ff0f9aeff357be3901f2c7937e3eeef98bfb802d7ae762ec83f40030dc4211b2f6c81c134127d548b9dc8162f9a50016e04bf
+  metadata.gz: ac40fb2c37aae92d55a166fb0b9a58e566970b4645717bacff12f275a579610b5eb0bd3e5107da5d4c0e01fc3c4a43471d87e6dbcff7abcb614a8cba2d552195
+  data.tar.gz: f34fd874e90719178f61299c83022b608c5b35167f72f77f78910dae0004afeb7d8dde9ebcee6c1acecb5ac86f840637071ac67378d907b73fcd6769712b7d7e

data/app/models/foreman_virt_who_configure/config.rb

@@ -139,9 +139,7 @@ module ForemanVirtWhoConfigure
     end    
 
     def validates_hypervisor_options
-      invalid = hypervisor_type == 'kubevirt' ? KUBEVIRT_INVALID_OPTIONS : KUBEVIRT_VALID_OPTIONS
-      invalid.concat(AHV_VALID_OPTIONS) unless hypervisor_type == 'ahv'
-      invalid.each { |f| errors.add(f, "Invalid option for hypervisor [#{hypervisor_type}]") if eval(f).present? }
+      invalid_fields.each { |f| errors.add(f, "Invalid option for hypervisor [#{hypervisor_type}]") if eval(f).present? }
     end
 
     validates_lengths_from_database
@@ -276,5 +274,16 @@ module ForemanVirtWhoConfigure
     def remove_whitespaces
       satellite_url.strip! if satellite_url.present?
     end
+
+    def invalid_fields
+      case hypervisor_type
+      when 'kubevirt'
+        KUBEVIRT_INVALID_OPTIONS + AHV_VALID_OPTIONS
+      when 'ahv'
+        KUBEVIRT_VALID_OPTIONS
+      else
+        KUBEVIRT_VALID_OPTIONS + AHV_VALID_OPTIONS
+      end
+    end
   end
 end

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -51,6 +51,7 @@ module ForemanVirtWhoConfigure
     def virt_who_output(format = nil)
       kubeconfig = config.hypervisor_type == 'kubevirt' ? "\nkubeconfig=#{config.kubeconfig_path}" : ''
       result = ''
+      cr_password_base64 = Base64.strict_encode64("#{cr_password}")
       result += "#!/bin/bash\n" if format == :bash_script
       result += <<EOS
 heading() {
@@ -105,8 +106,8 @@ install_virt_who
 
 if verify_minimal_version; then
   step 2 "Encrypting password"
-  cr_password=`virt-who-password --password '#{cr_password}' 2> /dev/null`
-  user_password=`virt-who-password --password '#{service_user_password}' 2> /dev/null`
+  cr_password=$(virt-who-password --password $(echo #{cr_password_base64}|base64 -d) 2> /dev/null)
+  user_password=$(virt-who-password --password '#{service_user_password}' 2> /dev/null)
 
   step 3 "Creating virt-who configuration"
   cat > #{config_file_path} << EOF
@@ -116,7 +117,7 @@ if verify_minimal_version; then
 type=#{type}
 hypervisor_id=#{hypervisor_id}
 owner=#{owner}
-env=Library#{connection_details}#{filtering}
+#{connection_details}#{filtering}
 rhsm_hostname=#{satellite_url}
 rhsm_username=#{service_user_username}
 rhsm_encrypted_password=$user_password

data/app/views/foreman_virt_who_configure/configs/steps/_connection_form.erb

@@ -13,9 +13,9 @@
 
   <%= textarea_f f, :blacklist, inline_help_popover(_('Hosts which uuid (or hostname or hwuuid, based on <code>hypervisor_id</code>) 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.')).merge(:label => _('Exclude hosts')) %>
 
-  <%= textarea_f f, :filter_host_parents, inline_help_popover(_('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.')).merge(:label => _('Filter host parents')) %>
+  <%= textarea_f f, :filter_host_parents, inline_help_popover(_('Only hosts which cluster ID is specified in comma-separated list in this option will 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.')).merge(:label => _('Filter host parents')) %>
 
-  <%= textarea_f f, :exclude_host_parents, inline_help_popover(_('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.')).merge(:label => _('Exclude host parents')) %>
+  <%= textarea_f f, :exclude_host_parents, inline_help_popover(_('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.')).merge(:label => _('Exclude host parents')) %>
 
   <%= checkbox_f f, :debug, { :label => _('Enable debugging output') }.merge(inline_help_popover(_("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."))) %>
   <%= select_f f, :http_proxy_id, HttpProxy.all, :id, :full_url, {:include_blank => true}, { :label => _('HTTP Proxy') }.merge(

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.8'.freeze
+  VERSION = '0.5.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors:
 - Foreman virt-who-configure team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -166,7 +166,7 @@ homepage: https://github.com/theforeman/foreman_virt_who_configure
 licenses:
 - GPLv3
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -182,13 +182,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A plugin to make virt-who configuration easy
 test_files:
 - test/factories/foreman_virt_who_configure_factories.rb
 - test/functional/api/v2/configs_controller_test.rb
-- test/unit/migrate_config_proxy_to_http_proxy.rb
+- test/test_plugin_helper.rb
 - test/unit/config_test.rb
+- test/unit/migrate_config_proxy_to_http_proxy.rb
 - test/unit/output_generator_test.rb
-- test/test_plugin_helper.rb