foreman_virt_who_configure 0.5.12 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c115626c7b275737586db28847ec80890761da8ea847eef7ecf4fa33cb84e242
-  data.tar.gz: 39fc91fc5e67ec1ac35ff44f13c892214ba3091b703da325ea7be852a375b181
+  metadata.gz: e1ddf912439f6fad74b1e2361a4a2fba2619c178a7b9f4f415b27f0dd416bcdb
+  data.tar.gz: a8e82c3e29d4a6a9da64240ab6eb8500d37eafae011c738385411f6a9f1d3a9f
 SHA512:
-  metadata.gz: d690c3c56cfe7ad5978c28107ac429bdfaa85a587d95b54a993e32b4543f63649da5aef1f5681bcf1e0aa9a7f92acb243f3dbda6a60d32ba486fe9262d2fd609
-  data.tar.gz: 37a53a0936528b60cef5245969ee9480397b73cdfef620e38bdcbd2aa8e00db5b009094207928934c4163845129ca132f046067363de9d59b435450a2aca7e7f
+  metadata.gz: e5a729769c5455cf399e88ac8e32136d315eab9c95df44e472d453559793d50a9a12f09b058a0b431ecabb55ad6bd113f6472c888a741b2ca69cb4e9ac679f29
+  data.tar.gz: 53650766a273bbbbc876ac35e2b6c7d869d2b15e45eb0c79a98eba42094b77f8f4932463d995dd547d8c28decc983b41ef99c4710ca36321cfbae7b6d64bcdd0

data/README.md

@@ -1,12 +1,12 @@
-# ForemanVirtWhoConfigure
+# Foreman Virt Who Configure
 
-A foreman plugin to make virt-who configuration easier. This provides simple UI for obtaining required information about the desired virt-who configuration, such as hypervisor credentials, check interval and similar. After the information is gathered, it provides a configuration script that can be used to install and configure the virt-who instance. All incoming reports from such virt-who instance are tracked and monitored by the plugin.
+A Foreman plugin to make virt-who configuration easier. This provides a simple UI for obtaining required information about the desired virt-who configuration, such as hypervisor credentials, check interval and other similar config options. After the information is gathered, it provides a configuration script that can be used to install and configure the virt-who instance. All incoming reports from such virt-who instance are tracked and monitored by the plugin.
 
 ## Installation
 
-This plugins requires Katello to be installed in your Foreman instance. If its there, simply install a package with the plugin (rpm only), run migrations and seed by running,
+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,
 
-yum install rubygem-foreman_virt_who_configure
+dnf install rubygem-foreman_virt_who_configure
 foreman-rake db:migrate
 foreman-rake db:seed
 
@@ -14,7 +14,7 @@ foreman-rake db:seed
 
 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.
 
-The virt-who configuration should be in an organization. If 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 organization is already selected then Owner field is not displayed and virt-configuration will be automatically created in 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.
 
@@ -26,7 +26,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2017 - Foreman team
+Copyright (c) 2023 - 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

@@ -35,8 +35,6 @@ function virt_who_update_hypervisor_fields() {
   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');
-  var element = $('#foreman_virt_who_configure_config_ahv_update_interval');
-  element.closest('.form-group').toggle(selected_type == 'ahv');
   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/api/v2/configs_controller.rb

@@ -57,7 +57,6 @@ module ForemanVirtWhoConfigure
             param :no_proxy, String, :desc => N_("Ignore proxy. A comma-separated list of hostnames or domains or ip addresses to ignore proxy settings for. Optionally this may be set to * to bypass proxy settings for all hostnames domains or ip addresses.")
             param :organization_id, Integer, :required => true, :desc => N_("Organization of the virt-who configuration") if ::SETTINGS[:organizations_enabled]
             param :prism_flavor, Config::PRISM_FLAVORS.keys, :desc => N_("Select the Prism flavor you are connecting to"), :required => false
-            param :ahv_update_interval, Integer, :desc => N_("The frequency of VM-to-host mapping updates for AHV(in seconds)"), :required => false
             param :ahv_internal_debug, :bool, :desc => N_("Option Enable debugging output is required to enable AHV internal debug. It provides extra AHV debug information when both options are enabled"), :required => false
           end
         end
@@ -75,7 +74,7 @@ module ForemanVirtWhoConfigure
         param_group :config
 
         def update
-          process_response @config.update_attributes(config_params)
+          process_response @config.update(config_params)
         end
 
         api :DELETE, '/configs/:id', N_("Delete a virt-who configuration")

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
@@ -49,18 +49,18 @@ module ForemanVirtWhoConfigure
     end
 
     def update
-      if @config.update_attributes(config_params)
-        process_success :object => @config
+      if @config.update(config_params)
+        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

@@ -7,7 +7,7 @@ module ForemanVirtWhoConfigure
       # API parameter filtering_mode gets translated to listing_mode in the controller
       # We keep both params permitted for compatibility with 1.11
       :listing_mode, :filtering_mode, :filter_host_parents, :exclude_host_parents, :kubeconfig_path,
-      :prism_flavor, :ahv_update_interval, :ahv_internal_debug
+      :prism_flavor, :ahv_internal_debug
     ]
     audited :except => [ :hypervisor_password, :last_report_at, :out_of_date_at ], :associations => []
     include Authorizable
@@ -72,7 +72,7 @@ module ForemanVirtWhoConfigure
       'element' => N_('Prism Element')
     }       
 
-    AHV_VALID_OPTIONS = %w(prism_flavor ahv_update_interval ahv_internal_debug)
+    AHV_VALID_OPTIONS = %w(prism_flavor ahv_internal_debug)
     KUBEVIRT_VALID_OPTIONS = %w(kubeconfig_path)
     KUBEVIRT_INVALID_OPTIONS = %w(hypervisor_server hypervisor_username)
 
@@ -113,7 +113,6 @@ module ForemanVirtWhoConfigure
     validates :hypervisor_id, :inclusion => HYPERVISOR_IDS
     validates :interval, :inclusion => AVAILABLE_INTERVALS.keys.map(&:to_i)
     validates :listing_mode, :inclusion => FILTERING_MODES.keys.map(&:to_i)
-    validates :ahv_update_interval, numericality: { only_integer: true, allow_nil: true, greater_than: 0 }, :if => Proc.new { |c| c.hypervisor_type == 'ahv' }
     validates :prism_flavor, :inclusion => {:in => PRISM_FLAVORS.keys, :message => "should be either central or element"}, :if => Proc.new { |c| c.hypervisor_type == 'ahv' }
     validate :validates_whitelist_blacklist
     validate :validates_debug_settings, :if => Proc.new { |c| c.hypervisor_type == 'ahv' }

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -169,10 +169,9 @@ encrypted_password=$cr_password"
     def ahv_config_options
       if config.hypervisor_type == 'ahv'
         prism_central = config.prism_flavor == "central"
-        update_interval = config.ahv_update_interval.present? ? "\nupdate_interval=#{config.ahv_update_interval}" : nil
         internal_debug = config.ahv_internal_debug.present? ? "\nahv_internal_debug=#{config.ahv_internal_debug}" : nil
 
-        "\nprism_central=#{prism_central}#{internal_debug}#{update_interval}"
+        "\nprism_central=#{prism_central}#{internal_debug}"
       else
         ""
       end

data/app/views/foreman_virt_who_configure/api/v2/configs/main.json.rabl

@@ -10,7 +10,7 @@ attributes :name, :interval, :organization_id, :whitelist, :blacklist, :hypervis
            :hypervisor_type, :hypervisor_server, :hypervisor_username, :debug,
            :satellite_url, :proxy, :no_proxy, :status, :last_report_at, :out_of_date_at,
            :filter_host_parents, :exclude_host_parents, :kubeconfig_path,
-           :prism_flavor, :ahv_update_interval, :ahv_internal_debug
+           :prism_flavor, :ahv_internal_debug
 
 child :http_proxy do
   attributes :id, :name, :url

data/app/views/foreman_virt_who_configure/configs/show.html.erb

@@ -53,7 +53,6 @@
           <%= config_attribute :no_proxy, @config.no_proxy, _('Ignore Proxy') if @config.no_proxy.present? %>
           <%= config_attribute :kubeconfig_path, @config.kubeconfig_path if @config.hypervisor_type == 'kubevirt' %>
           <%= config_attribute :prism_flavor, @config.prism_flavor if @config.hypervisor_type == 'ahv' %>
-          <%= config_attribute :ahv_update_interval, @config.ahv_update_interval if @config.hypervisor_type == 'ahv' %>
           <%= config_attribute :ahv_internal_debug, checked_icon(@config.ahv_internal_debug) if @config.hypervisor_type == 'ahv' %>
         </div>
       </div>

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

@@ -26,6 +26,5 @@
   <%= selectable_f f, :prism_flavor, {'' => 'Nothing selected'}.merge(ForemanVirtWhoConfigure::Config::PRISM_FLAVORS).map { |k,v| [_(v), k] },
         {}, { label: _('Prism Flavor'), :required => true }.merge(
         inline_help_popover(_("Select the Prism flavor you are connecting to"))) %>
-  <%= text_f f, :ahv_update_interval, inline_help_popover(_('The frequency of VM-to-host mapping updates for AHV(in seconds)')).merge(:label => _('AHV update interval')) %>
   <%= checkbox_f f, :ahv_internal_debug, inline_help_popover(_('Option Enable debugging output is required to enable AHV internal debug. It provides extra AHV debug information when both options are enabled ')).merge(:label => _('Enable AHV debug')) %>
 </div>

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.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/db/migrate/20230210152216_remove_ahv_update_interval_from_config.rb

@@ -0,0 +1,5 @@
+class RemoveAhvUpdateIntervalFromConfig < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :foreman_virt_who_configure_configs, :ahv_update_interval, :integer
+  end
+end

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.12'.freeze
+  VERSION = '0.5.14'.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")