foreman_virt_who_configure 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 013fa656ae374744bb4fb2f971ba1d4eaf8bdaec545fc1cf2521676f8a43b3cf
-  data.tar.gz: 66ac2d89d40eff95b6af89b18827b066510ffcca72741307b4f45dfd8d0092c1
+  metadata.gz: 804bfa0dcf42fa2495425b159e3c2edbea164afcad098d15f7cafc2f543c659c
+  data.tar.gz: 88e7460569118f50f3c635ad9c6e55e0db10d118cd96131338f4928cd4abbcb1
 SHA512:
-  metadata.gz: 2cdf1312584473aa29ef1693d6bfb83134c9e13b368e1f3f762799e8952273cf68d370b851ae2b0a4137d35df50cd1ad4e1d49f94fa339871c6266875fe0980d
-  data.tar.gz: 05607f81fa6c58bb53f2a412fb31ebafd3c3c991b61e6a69dd861f9aefafdf30ce0835d5f66fa0d1901f6597a9f0a88cd2ee6cafb5872374f45f4926377ed687
+  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/controllers/foreman_virt_who_configure/configs_controller.rb

@@ -36,7 +36,7 @@ module ForemanVirtWhoConfigure
     def create
       @config = Config.new(config_params)
       if @config.save
-        process_success :success_redirect => foreman_virt_who_configure_config_path(@config), :object => @config
+        process_success :success_redirect => foreman_virt_who_configure_config_path(@config), :object => @config.name
       else
         render 'new'
       end
@@ -50,17 +50,17 @@ module ForemanVirtWhoConfigure
 
     def update
       if @config.update(config_params)
-        process_success :object => @config
+        process_success :object => @config.name
       else
-        process_error :object => @config
+        process_error :object => @config.name
       end
     end
 
     def destroy
       if @config.destroy
-        process_success :object => @config
+        process_success :object => @config.name
       else
-        process_error :object => @config
+        process_error :object => @config.name
       end
     end
 

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

@@ -1,5 +1,5 @@
 <div id="config_general_information">
-  <%= text_f f, :name, inline_help_popover(_('Name of this configuration, e.g. the name of the hypervisor')) %>
+  <%= text_f f, :name, inline_help_popover(_('Name of this configuration, e.g. the name of the hypervisor')).merge(:label => _('Name')) %>
 
   <% if f.object.organization_id.present? %>
     <%= f.hidden_field :organization_id %>
@@ -7,8 +7,8 @@
     <%= select_f f, :organization_id, Organization.authorized(:view_organizations), :id, :to_s, {}, :label => _('Owner') %>
   <% end %>
 
-  <%= select_f f, :hypervisor_type, ForemanVirtWhoConfigure::Config::HYPERVISOR_TYPES, :first, :last %>
-  <%= text_f f, :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, { :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, { :required => true, :value => f.object.hypervisor_password }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
+  <%= 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.attributes["hypervisor_password"] }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
 </div>

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

@@ -1,3 +1,3 @@
 <div id="config_schedule">
-  <%= selectable_f f, :interval, ForemanVirtWhoConfigure::Config::AVAILABLE_INTERVALS.map { |k,v| [_(v), k] }, {}, inline_help_popover(_("How often to check connected hypervisors for changes? Also affects how often a mapping is reported. The recommended value for most environments is every two hours. Different interval can't be set per hypervisor, therefore it will affect all other deployed configurations on the host on which this configuration will be deployed.")) %>
+  <%= selectable_f f, :interval, ForemanVirtWhoConfigure::Config::AVAILABLE_INTERVALS.map { |k,v| [_(v), k] }, {}, inline_help_popover(_("How often to check connected hypervisors for changes? Also affects how often a mapping is reported. The recommended value for most environments is every two hours. Different interval can't be set per hypervisor, therefore it will affect all other deployed configurations on the host on which this configuration will be deployed.")).merge(:label => _('Interval')) %>
 </div>

data/lib/foreman_virt_who_configure/engine.rb

@@ -27,7 +27,7 @@ module ForemanVirtWhoConfigure
 
     initializer 'foreman_virt_who_configure.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_virt_who_configure do
-        requires_foreman '>= 1.24'
+        requires_foreman '>= 3.7'
 
         apipie_documented_controllers ["#{ForemanVirtWhoConfigure::Engine.root}/app/controllers/foreman_virt_who_configure/api/v2/*.rb"]
 

data/lib/foreman_virt_who_configure/version.rb

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

data/locale/action_names.rb

@@ -11,12 +11,10 @@ _("Copy version units to library")
 _("Create Alternate Content Source")
 _("Create Export History")
 _("Create Import History")
-_("Create Package Group")
 _("Create Syncable Export History")
 _("Create")
 _("Delete Activation Key")
 _("Delete Lifecycle Environment")
-_("Delete Package Group")
 _("Delete Product")
 _("Delete")
 _("Destroy Alternate Content Source")
@@ -57,6 +55,7 @@ _("Publish Lifecycle Environment Repositories")
 _("Publish")
 _("Refresh Alternate Content Source")
 _("Reindex subscriptions")
+_("Remote action:")
 _("Remove Content")
 _("Remove Version")
 _("Remove Versions and Associations")