foreman_virt_who_configure 0.5.20 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440065d1546034aad5444c97c65f80d75b516aa020a4b39b7cd2de7be606156f
-  data.tar.gz: 2a916a56cd2cb7735770eb46a3d47b05e99077f9cb3a3dc015487bf20ce527a7
+  metadata.gz: 22ea7c1f01f0e5903a2f219b5be36745a0c229b5471f2538ab88e65dc8117ff0
+  data.tar.gz: 1d53ba8208462ef5c2c01c67c18c1b37523effdfb9bfc3bee174e64aa86e2a18
 SHA512:
-  metadata.gz: cb3daff17402b052f18ebd870055609fb3a43550b2b07bc53be212af51cce76e492efd3c6b4fac95ef81ddbe992641aa8bf139db0dec56ac14911114329a575b
-  data.tar.gz: 39538b399466371a389305e163958c1018e0b24139a077fbeb4d1664724c338b1c39c87f9681b296d7c2652d87421be96851c57a7ba46e185578a1bc5e923955
+  metadata.gz: 5032cbca7e710798ca4061d88c5d2de7b001aa6acd39c54227d049b68321c8c35dbf50d3bbe1907821faa7d0363224f3fe9e60655f7240314bd279aab49df209
+  data.tar.gz: 96acfb4d9ca5099569c7a149c1c3b809595cb0ccf52f7bc6338ca8684318c1080170031b65374fc8e214dab9dd5636bc43ccab7aa85b6bfff6ec923a8e3775c8

data/README.md

@@ -4,21 +4,33 @@ A Foreman plugin to make virt-who configuration easier. This provides a simple U
 
 ## Installation
 
-This plugins requires Katello to be installed in your Foreman instance. If it's there, simply install a package with the plugin (rpm only), run migrations and seed by running,
+### Development setup:
 
+* This plugin requires Katello to be installed in your Foreman instance. If it's there, simply install a package with the plugin (rpm only), run migrations and seed by running:
+
+```
 dnf install rubygem-foreman_virt_who_configure
 foreman-rake db:migrate
 foreman-rake db:seed
+```
+
+### Production setup:
+
+* Run the following command to install the plugin with the Foreman Installer.
+```
+foreman-installer --enable-foreman-plugin-virt-who-configure
+foreman-installer --enable-foreman-cli-virt-who-configure
+```
 
 ## Usage
 
-After installation there is new "Virt-who configurations" menu added in "Infrastructure" tab. The "Virt-who configurations" -> "Create Config" provides options to add details about configuration, most of the fields are having inline help.
+* After installation there is new "Virt-who Configurations" menu added in "Infrastructure" tab. The "Virt-who Configurations" -> "Create Config" provides options to add details about configuration, most of the fields have inline help.
 
-The virt-who configuration should be in an organization. If an organization has not selected then Owner field would be displayed where it is required to select organization. If organization is already selected then Owner field is not displayed and virt-configuration will be automatically created in selected organization scope.
+* The virt-who configuration should be in an organization. If an organization has not selected then Owner field would be displayed where it is required to select organization. If an organization is already selected then Owner field is not displayed and virt-configuration will be automatically created in the selected organization scope.
 
-To deploy the configuration click on configuration name on "Virt-who configurations" list page, "Overview" page shows details about configuration and "Deploy page" has all details on deploying configuration.
+* To deploy the configuration click on configuration name on "Virt-who Configurations" list page, "Overview" page shows details about configuration and "Deploy page" has all details on deploying configuration.
 
-More details are available at - https://theforeman.org/plugins/foreman_virt_who_configure
+* More details are available at - https://theforeman.org/plugins/foreman_virt_who_configure
 
 ## Contributing
 
@@ -26,7 +38,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2023 - Foreman team
+Copyright (c) 2024 - Foreman team
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 
 Bundler::GemHelper.install_tasks
 

data/app/assets/javascripts/foreman_virt_who_configure/config_edit.js

@@ -5,6 +5,14 @@ function virt_who_update_listing_mode() {
   var blacklist = $('#foreman_virt_who_configure_config_blacklist').parents('div.form-group');
   var whitelist_parent = $('#foreman_virt_who_configure_config_filter_host_parents').parents('div.form-group');
   var blacklist_parent = $('#foreman_virt_who_configure_config_exclude_host_parents').parents('div.form-group');
+  var hypervisor_ids = foreman_virt_who_configure_config_hypervisor_id;
+
+  // https://projects.theforeman.org/issues/26321
+  if (hypervisor_type != 'esx') {
+    $(hypervisor_ids).find('option[value=hwuuid]').remove();
+  } else if (hypervisor_type == 'esx' && $(hypervisor_ids).find('option[value=hwuuid]').length == 0) {
+    $(hypervisor_ids).append('<option value='+'hwuuid>'+'hwuuid'+'</option>');
+  }
 
   // UNLIMITED = 0, WHITELIST = 1, BLACKLIST = 2, see config.rb model for the definition
   if (filtering_mode == '0') {

data/app/models/foreman_virt_who_configure/config.rb

@@ -116,6 +116,7 @@ module ForemanVirtWhoConfigure
     validates :prism_flavor, :inclusion => {:in => PRISM_FLAVORS.keys, :message => "should be either central or element"}, :if => proc { |c| c.hypervisor_type == 'ahv' }
     validate :validates_whitelist_blacklist
     validate :validates_debug_settings, :if => proc { |c| c.hypervisor_type == 'ahv' }
+    validate :validates_hypervisor_id_non_vmware, :if => proc { |c| c.hypervisor_type != 'esx' }
     validate :validates_hypervisor_options
 
     def validates_whitelist_blacklist
@@ -131,6 +132,13 @@ module ForemanVirtWhoConfigure
       end
     end
 
+    def validates_hypervisor_id_non_vmware
+      return unless hypervisor_id.present?
+      if hypervisor_id == 'hwuuid'
+        errors.add(:hypervisor_id, "hwuuid is only supported for ESX hypervisor type")
+      end
+    end
+
     def validates_debug_settings
       if ahv_internal_debug && !debug
         errors.add(:ahv_internal_debug, "Enable debugging output is required for Enable AHV debug")

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -131,8 +131,10 @@ module ForemanVirtWhoConfigure
         ### manual edits will be deleted.
         [global]
         debug=#{config.debug? ? 1 : 0}
-        interval=#{config.interval * 60}#{proxy_strings}
+        interval=#{config.interval * 60}
         oneshot=False
+
+        [system_environment]#{proxy_strings}
         EOF
           if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_sysconfig_file_issue)})); fi
 
@@ -289,7 +291,6 @@ encrypted_password=$cr_password"
       output = ''
       output << "\n#{proxy_type}=#{sanitize_proxy(proxy.full_url)}" if proxy.present?
       output << "\nno_proxy=#{sanitize_proxy(no_proxy)}" if no_proxy.present?
-      output << "\nno_proxy=*" if proxy.blank? && no_proxy.blank?
       output
     end
 

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

@@ -1,5 +1,5 @@
 <div id="config_connection">
-  <%= text_f f, :satellite_url, inline_help_popover(_('Foreman server’s fully-qualified host name, for example: foreman.example.com')).merge(:label => _('Foreman server FQDN')) %>
+  <%= text_f f, :satellite_url, inline_help_popover(_('Foreman server’s fully-qualified host name, for example: foreman.example.com')).merge(:label => _('Foreman server FQDN'), readonly: true) %>
   <%= select_f f, :hypervisor_id, ForemanVirtWhoConfigure::Config::HYPERVISOR_IDS, :to_s, :to_s, {}, { :label => _('Hypervisor ID') }.merge(
         inline_help_popover(_("Specifies that hypervisors will be identified by their <b>hostname</b>, <b>uuid</b> or <b>hwuuid</b>.
                               Note that some virtualization backends don't have all of them implemented.
@@ -18,7 +18,7 @@
   <%= 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(
+  <%= select_f f, :http_proxy_id, HttpProxy.all, :id, :name, {:include_blank => true}, { :label => _('HTTP Proxy') }.merge(
         inline_help_popover(_('HTTP proxy that should be used for communication between the server on which virt-who is running and the hypervisors and virtualization managers. Leave this blank if no proxy is used.').html_safe)) %>
   <%= text_f f, :no_proxy, inline_help_popover(_('A comma-separated list of hostnames or domains or ip addresses to ignore proxy settings for. Optionally this may be set to <code>*</code> to bypass proxy settings for all hostnames domains or ip addresses.')).merge(:label => _('Ignore proxy')) %>
   <%= text_f f, :kubeconfig_path, inline_help_popover(_('Configuration file containing details about how to connect to the cluster and authentication details')).merge(:label => _('Path to kubeconfig file')) %>

data/lib/foreman_virt_who_configure/engine.rb

@@ -71,7 +71,7 @@ module ForemanVirtWhoConfigure
         # add menu entry
         menu :top_menu, :virt_who_configs,
           url_hash: { controller: 'foreman_virt_who_configure/configs', action: :index },
-          caption: N_('Virt-who configurations'),
+          caption: N_('Virt-who Configurations'),
           parent: :infrastructure_menu,
           after: :compute_resources
 

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.20'.freeze
+  VERSION = '0.5.22'.freeze
 end

data/locale/action_names.rb

@@ -0,0 +1,2 @@
+# Autogenerated!
+_("Report")