foreman_virt_who_configure 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1ddf912439f6fad74b1e2361a4a2fba2619c178a7b9f4f415b27f0dd416bcdb
-  data.tar.gz: a8e82c3e29d4a6a9da64240ab6eb8500d37eafae011c738385411f6a9f1d3a9f
+  metadata.gz: 804bfa0dcf42fa2495425b159e3c2edbea164afcad098d15f7cafc2f543c659c
+  data.tar.gz: 88e7460569118f50f3c635ad9c6e55e0db10d118cd96131338f4928cd4abbcb1
 SHA512:
-  metadata.gz: e5a729769c5455cf399e88ac8e32136d315eab9c95df44e472d453559793d50a9a12f09b058a0b431ecabb55ad6bd113f6472c888a741b2ca69cb4e9ac679f29
-  data.tar.gz: 53650766a273bbbbc876ac35e2b6c7d869d2b15e45eb0c79a98eba42094b77f8f4932463d995dd547d8c28decc983b41ef99c4710ca36321cfbae7b6d64bcdd0
+  metadata.gz: 66123eb9a60975f6dc753efe576a25d83ebf66f95e3d15b80766f014d7f22c5dc0d36fcbeb592249ed5ad53c39d77f2359222397a1e89fa93fcf1156ff28b69b
+  data.tar.gz: 987c19db5ea036ceaaf02fe1235441cc9a251816196b5c6d5a7da796ce61210313d4e045118c129e94f9780f681ec5f367368bf8f3bcb8c748fee5dbf8e890be

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

@@ -28,13 +28,13 @@ function virt_who_update_listing_mode() {
 function virt_who_update_hypervisor_fields() {
   selected_type = $('#foreman_virt_who_configure_config_hypervisor_type').val();
   var element = $('#foreman_virt_who_configure_config_hypervisor_username');
-  element.closest('.form-group').toggle(selected_type != 'kubevirt');
+  element.closest('.form-group').toggle(selected_type != 'libvirt' && selected_type != 'kubevirt');
   var element = $('#foreman_virt_who_configure_config_hypervisor_password');
   element.closest('.form-group').toggle(selected_type != 'libvirt' && selected_type != 'kubevirt');
   var element = $('#foreman_virt_who_configure_config_kubeconfig_path');
   element.closest('.form-group').toggle(selected_type == 'kubevirt');
   var element = $('#foreman_virt_who_configure_config_hypervisor_server');
-  element.closest('.form-group').toggle(selected_type != 'kubevirt');
+  element.closest('.form-group').toggle(selected_type != 'libvirt' && selected_type != 'kubevirt');
   var element = $('#foreman_virt_who_configure_config_ahv_internal_debug');
   element.closest('.form-group').toggle(selected_type == 'ahv');
   virt_who_update_listing_mode();

data/app/models/foreman_virt_who_configure/config.rb

@@ -106,8 +106,8 @@ module ForemanVirtWhoConfigure
               :presence => true
     validates :name, :uniqueness => { :scope => :organization_id }
     validates :hypervisor_password, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
-    validates :hypervisor_username, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
-    validates :hypervisor_server, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
+    validates :hypervisor_username, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
+    validates :hypervisor_server, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
     validates :kubeconfig_path, :presence => true, :if => Proc.new { |c| c.hypervisor_type == 'kubevirt' }
     validates :hypervisor_type, :inclusion => HYPERVISOR_TYPES.keys
     validates :hypervisor_id, :inclusion => HYPERVISOR_IDS

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -159,6 +159,8 @@ EOS
     def connection_details
       if config.hypervisor_type == 'kubevirt'
         ""
+      elsif config.hypervisor_type == 'libvirt'
+        "\nserver=qemu:///system"
       else
         "\nserver=#{cr_server}
 username=#{cr_username}

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

@@ -10,5 +10,5 @@
   <%= select_f f, :hypervisor_type, ForemanVirtWhoConfigure::Config::HYPERVISOR_TYPES, :first, :last, {}, { :label => _('Hypervisor Type') } %>
   <%= text_f f, :hypervisor_server, { :label => _('Hypervisor Server'), :required => true }.merge(inline_help_popover(hypervisor_server_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_server_help_data })) %>
   <%= text_f f, :hypervisor_username, { :label => _('Hypervisor Username'), :required => true }.merge(inline_help_popover(hypervisor_username_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_username_help_data }))  %>
-  <%= password_f f, :hypervisor_password, { :label => _('Hypervisor Password'), :required => true, :value => f.object.hypervisor_password }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
+  <%= password_f f, :hypervisor_password, { :label => _('Hypervisor Password'), :required => true, :value => f.object.attributes["hypervisor_password"] }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
 </div>

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.14'.freeze
+  VERSION = '0.5.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello