foreman_virt_who_configure 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec81d0d25964289226511f89e97ba3f1206a2c507e7b2397f84f8733074f4c9
-  data.tar.gz: 128103a173ff39059da75e62c406346a7814855ad94b0b3584a9ab5e65b69fcf
+  metadata.gz: 22ea7c1f01f0e5903a2f219b5be36745a0c229b5471f2538ab88e65dc8117ff0
+  data.tar.gz: 1d53ba8208462ef5c2c01c67c18c1b37523effdfb9bfc3bee174e64aa86e2a18
 SHA512:
-  metadata.gz: 779b402b0d303138bbe654ef8ed3fb17ad227cafa82977cec81ba84da5cde29d54e1aa743b51f35b0deeafc2a3073ab6c39c31d3f919cbfa0000ee6f7455af85
-  data.tar.gz: 3fe10668d94b0b5b8b81e95def0f8e353b4a8e98e5d7013be2b63934004083967f714434d6a867260c45c7363c5b59a300ba75838f361dfe5be5a6e26641a8ab
+  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/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/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.

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.21'.freeze
+  VERSION = '0.5.22'.freeze
 end

data/locale/action_names.rb

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