foreman_virt_who_configure 0.5.6 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a1caca71ecc26f921be69f4efe48943a0ac7b79a0b5a7cb2d99fe41bfc202f
-  data.tar.gz: 000115561c5ad123da017fb662913cb3dbbe2e1113adf23cc73315735c906022
+  metadata.gz: ebe633c7a71e52d7c3147991e799004c5485395776abedd61f5864fac80a7714
+  data.tar.gz: a493b3989deffb1bb8e0da3ba3821e20c900f6da05505a0aef70621984658046
 SHA512:
-  metadata.gz: e84d2ec1aa61e5f37e1354ece1ef2e04493623cd791d0b839f996270fa32bb652aaa96af7c365015f53638658a5064d6d13c14be61704f8a765208d190389e58
-  data.tar.gz: 5c3d700fc5babc9d73a53c77aab32b5e92f896818fa9903efdcc5f1350c94c0c776cc27ba564bd2b0826298eef0952a7da90ccc2ab2ff24ba5f9444e50ab83f3
+  metadata.gz: f1c8df97b8a0b6b699dfb2a38f8a5715a609bdd92f119c2e6ece75e75fcd6002f54db833a32a79623f4b6d30a8cf663e9de4f6c8a82a79481de00c3d6ddb44ad
+  data.tar.gz: 541cf3ec422f78a999975f54a7f0d8c79d32166c7ce252050ef03ef944606d79ff8f6b8187d8f5b6b04b1db5630f6c97646350a649129a8bbd173dff72f138f2

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

@@ -35,7 +35,13 @@ 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();
+  var element = $('#foreman_virt_who_configure_config_prism_flavor');
+  element.closest('.form-group').toggle(selected_type == 'ahv');
 }
 
 function virt_who_update_credentials_help() {
@@ -53,9 +59,23 @@ function virt_who_update_credentials_help() {
   });
 }
 
+function virt_who_update_ahv_debug() {
+  var element = $('#foreman_virt_who_configure_config_ahv_internal_debug');
+  var element_debug = $('#foreman_virt_who_configure_config_debug');
+
+  element.mouseenter(function(){
+    var inline_help_popover_ahv = element.parents('.form-group').find('.help-inline a[rel=popover]');
+    var inline_help_popover_global = element_debug.parents('.form-group').find('.help-inline a[rel=popover]');
+    inline_help_popover_ahv.popover('show');
+    inline_help_popover_global.popover('show');
+  });
+}
+
 $(document).ready(function () {
   virt_who_update_listing_mode();
   virt_who_update_hypervisor_fields();
+  virt_who_update_ahv_debug();
+
   $('#foreman_virt_who_configure_config_listing_mode').change(virt_who_update_listing_mode);
   $('#foreman_virt_who_configure_config_hypervisor_type').change(virt_who_update_credentials_help);
   $('#foreman_virt_who_configure_config_hypervisor_type').change(virt_who_update_hypervisor_fields);

data/app/controllers/foreman_virt_who_configure/api/v2/configs_controller.rb

@@ -47,14 +47,18 @@ module ForemanVirtWhoConfigure
             param :exclude_host_parents, String, :desc => N_("Applicable only for esx provider type. Hosts which parent (usually ComputeResource) name is specified in comma-separated list in this option will <b>NOT</b> be reported. 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."), :required => false
             param :hypervisor_id, Config::HYPERVISOR_IDS, :desc => N_("Specifies how the hypervisor will be identified."), :required => true
             param :hypervisor_type, Config::HYPERVISOR_TYPES.keys, :desc => N_("Hypervisor type"), :required => true
-            param :hypervisor_server, String, :desc => N_("Fully qualified host name or IP address of the hypervisor"), :required => true
-            param :hypervisor_username, String, :desc => N_("Account name by which virt-who is to connect to the hypervisor."), :required => true
-            param :hypervisor_password, String, :desc => N_("Hypervisor password, required for all hypervisor types except for libvirt"), :required => false
-            param :satellite_url, String, :desc => N_("Satellite server FQDN"), :required => true
+            param :hypervisor_server, String, :desc => N_("Fully qualified host name or IP address of the hypervisor"), :required => false
+            param :hypervisor_username, String, :desc => N_("Account name by which virt-who is to connect to the hypervisor."), :required => false
+            param :hypervisor_password, String, :desc => N_("Hypervisor password, required for all hypervisor types except for libvirt/kubevirt."), :required => false
+            param :satellite_url, String, :desc => N_("Foreman server FQDN"), :required => true
             param :debug, :bool, :desc => N_("Enable debugging output")
+            param :kubeconfig_path, String, :desc => N_('Configuration file containing details about how to connect to the cluster and authentication details.'), :required => false
             param :http_proxy_id, Integer, :desc => N_('HTTP proxy that should be used for communication between the server on which virt-who is running and the hypervisors and virtualization managers.')
             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
 

data/app/helpers/foreman_virt_who_configure/configs_helper.rb

@@ -3,20 +3,20 @@ module ForemanVirtWhoConfigure
     def hypervisor_server_help_data
       @hypervisor_server_help_data ||= {
         'esx' => _('VMware vCenter server’s fully qualified host name or IP address.'),
-        'rhevm' => _('Red Hat Virtualization Manager’s fully qualified host name or IP address. For example, <code>https://hostname:443/ovirt-engine/</code> for v4, <code>https://hostname_or_IP:443</code> for v3'),
         'hyperv' => _('Microsoft Hyper-V fully qualified host name or IP address.'),
         'libvirt' => _('Libvirt server’s fully qualified host name or IP address. You can also specify preferred schema, for example: <code>qemu+ssh://libvirt.example.com/system</code>. If you use SSH, make sure you setup root\'s SSH key on target host for a user specified at hypervisor username field'),
-        'kubevirt' => _('Container-native virtualization’s fully qualified host name or IP address. In order to connect to the cluster it is required to provide path to kubeconfig which contains connection details and authentication token.')
+        'kubevirt' => _('Container-native virtualization’s fully qualified host name or IP address. In order to connect to the cluster it is required to provide path to kubeconfig which contains connection details and authentication token.'),
+        'ahv' => _('Nutanix AHV’s IP address.')
       }
     end
 
     def hypervisor_username_help_data
       @hypervisor_username_help_data ||= {
-        'esx' => _('Account name by which virt-who is to connect to the hypervisor, in the format <code>domain_name\account_name</code>. Note that only a single backslash separates the values for domain_name and account_name. If you are using a domain account, and the global configuration file <code>/etc/sysconfig/virt-who</code>, then <b>two</b> backslashes are required. For further details, see <a href="https://access.redhat.com/solutions/1270223">Red Hat Knowledgebase solution How to use a windows domain account with virt-who</a> for more information.'),
-        'rhevm' => _('Account name by which virt-who is to connect to the Red Hat Enterprise Virtualization Manager instance. The username option requires input in the format username@domain.'),
+        'esx' => _('Account name by which virt-who is to connect to the hypervisor, in the format <code>domain_name\account_name</code>. Note that only a single backslash separates the values for domain_name and account_name. If you are using a domain account, and the global configuration file <code>/etc/virt-who.conf</code>, then <b>two</b> backslashes are required. For further details, see <a href="https://access.redhat.com/solutions/1270223">Red Hat Knowledgebase solution How to use a windows domain account with virt-who</a> for more information.'),
         'hyperv' => _('Account name by which virt-who is to connect to the hypervisor. By default this is <code>Administrator</code>. To use an alternate account, create a user account and assign that account to the following groups (Windows 2012 Server): Hyper-V Administrators and Remote Management Users.'),
         'libvirt' => _('Account name by which virt-who is to connect to the hypervisor. Virt-who does not support password based authentication, you must manually setup SSH key, see <a href="https://access.redhat.com/solutions/1515983">Red Hat Knowledgebase solution How to configure virt-who for a KVM host</a> for more information.'),
-        'kubevirt' => ''
+        'kubevirt' => '',
+        'ahv' => _('Account name by which virt-who is to connect to Nutanix AHV.')
       }
     end
 

data/app/models/foreman_virt_who_configure/config.rb

@@ -6,7 +6,8 @@ module ForemanVirtWhoConfigure
       :satellite_url, :http_proxy_id, :no_proxy, :name,
       # 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
+      :listing_mode, :filtering_mode, :filter_host_parents, :exclude_host_parents, :kubeconfig_path,
+      :prism_flavor, :ahv_update_interval, :ahv_internal_debug
     ]
     audited :except => [ :hypervisor_password, :last_report_at, :out_of_date_at ], :associations => []
     include Authorizable
@@ -31,10 +32,10 @@ module ForemanVirtWhoConfigure
 
     HYPERVISOR_TYPES = {
       'esx' => 'VMware vSphere / vCenter (esx)',
-      'rhevm' => 'Red Hat Virtualization Hypervisor (rhevm)',
       'hyperv' => 'Microsoft Hyper-V (hyperv)',
       'libvirt' => 'libvirt',
-      'kubevirt' => 'Container-native virtualization'
+      'kubevirt' => 'Container-native virtualization',
+      'ahv' => 'Nutanix AHV (ahv)'
     }
 
     HYPERVISOR_DEFAULT_TYPE = 'esx'
@@ -66,6 +67,15 @@ module ForemanVirtWhoConfigure
       }
     )
 
+    PRISM_FLAVORS = {
+      'central' => N_('Prism Central'),
+      'element' => N_('Prism Element')
+    }       
+
+    AHV_VALID_OPTIONS = %w(prism_flavor ahv_update_interval ahv_internal_debug)
+    KUBEVIRT_VALID_OPTIONS = %w(kubeconfig_path)
+    KUBEVIRT_INVALID_OPTIONS = %w(hypervisor_server hypervisor_username)
+
     include Encryptable
     encrypts :hypervisor_password
 
@@ -98,11 +108,16 @@ module ForemanVirtWhoConfigure
     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 :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
     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' }
+    validate :validates_hypervisor_options
 
     def validates_whitelist_blacklist
       case listing_mode.to_i
@@ -117,6 +132,16 @@ module ForemanVirtWhoConfigure
       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") 
+      end
+    end    
+
+    def validates_hypervisor_options
+      invalid_fields.each { |f| errors.add(f, "Invalid option for hypervisor [#{hypervisor_type}]") if eval(f).present? }
+    end
+
     validates_lengths_from_database
 
     before_validation :remove_whitespaces
@@ -185,8 +210,6 @@ module ForemanVirtWhoConfigure
     #     'libvirt'
     #   when Foreman::Model::Vmware
     #     'esx'
-    #   when Foreman::Model::Ovirt
-    #     'rhevm'
     #   else
     #     raise 'unsupported compute resource type'
     # end
@@ -251,5 +274,16 @@ module ForemanVirtWhoConfigure
     def remove_whitespaces
       satellite_url.strip! if satellite_url.present?
     end
+
+    def invalid_fields
+      case hypervisor_type
+      when 'kubevirt'
+        KUBEVIRT_INVALID_OPTIONS + AHV_VALID_OPTIONS
+      when 'ahv'
+        KUBEVIRT_VALID_OPTIONS
+      else
+        KUBEVIRT_VALID_OPTIONS + AHV_VALID_OPTIONS
+      end
+    end
   end
 end

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -19,9 +19,9 @@ module ForemanVirtWhoConfigure
       ConfigurationResult.new(1, 'virt_who_too_old', N_('Newer version of virt-who is required, minimum version is %s') % MINIMUM_VIRT_WHO_VERSION),
       ConfigurationResult.new(2, 'virt_who_config_file_issue', N_('Unable to create virt-who config file')),
       ConfigurationResult.new(4, 'virt_who_sysconfig_file_issue', N_('Unable to create sysconfig file')),
-      ConfigurationResult.new(8, 'virt_who_chkconfig_issue', N_('Unable to enable virt-who service using chkconfig')),
+      ConfigurationResult.new(8, 'virt_who_systemctl_issue', N_('Unable to enable virt-who service using systemctl')),
       ConfigurationResult.new(16, 'virt_who_service_issue', N_('Unable to start virt-who service, please see virt-who logs for more details')),
-      ConfigurationResult.new(32, 'virt_who_installation', N_('Unable to install virt-who package, make sure the host is properly subscribed and has access to satellite-tools repository')),
+      ConfigurationResult.new(32, 'virt_who_installation', N_('Unable to install virt-who package, make sure the host is properly subscribed and has access to katello-host-tools repository')),
     ]
 
     attr_reader :config
@@ -51,6 +51,7 @@ module ForemanVirtWhoConfigure
     def virt_who_output(format = nil)
       kubeconfig = config.hypervisor_type == 'kubevirt' ? "\nkubeconfig=#{config.kubeconfig_path}" : ''
       result = ''
+      cr_password_base64 = Base64.strict_encode64("#{cr_password}")
       result += "#!/bin/bash\n" if format == :bash_script
       result += <<EOS
 heading() {
@@ -75,7 +76,7 @@ verify_minimal_version() {
   installed_version=`rpm -q --queryformat '%{VERSION}' virt-who`
 
   if version_lt $installed_version $minimal_version; then
-    echo "virt-who $installed_version does not meet minimum requirements, please make sure this host is properly subscribed and has access to satellite-tools repository, minimal virt-who version is $minimal_version"
+    echo "virt-who $installed_version does not meet minimum requirements, please make sure this host is properly subscribed and has access to katello-host-tools repository, minimal virt-who version is $minimal_version"
     return 1
   else
     return 0
@@ -105,7 +106,7 @@ install_virt_who
 
 if verify_minimal_version; then
   step 2 "Encrypting password"
-  cr_password=`virt-who-password --password '#{cr_password}' 2> /dev/null`
+  cr_password=`virt-who-password --password $(echo #{cr_password_base64}|base64 -d) 2> /dev/null`
   user_password=`virt-who-password --password '#{service_user_password}' 2> /dev/null`
 
   step 3 "Creating virt-who configuration"
@@ -116,26 +117,28 @@ if verify_minimal_version; then
 type=#{type}
 hypervisor_id=#{hypervisor_id}
 owner=#{owner}
-env=Library#{connection_details}#{filtering}
+#{connection_details}#{filtering}
 rhsm_hostname=#{satellite_url}
 rhsm_username=#{service_user_username}
 rhsm_encrypted_password=$user_password
-rhsm_prefix=/rhsm#{kubeconfig}
+rhsm_prefix=/rhsm#{kubeconfig}#{ahv_config_options}
 EOF
   if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_config_file_issue)})); fi
 
   step 4 "Creating sysconfig virt-who configuration"
-  cat > #{sysconfig_file_path} << EOF
+  cat > #{default_config_path} << EOF
 ### This configuration file is managed via the virt-who configure plugin
 ### manual edits will be deleted.
-VIRTWHO_DEBUG=#{config.debug? ? 1 : 0}
-VIRTWHO_INTERVAL=#{config.interval * 60}#{proxy_strings}
+[global]
+debug=#{config.debug? ? 1 : 0}
+interval=#{config.interval * 60}#{proxy_strings}
+oneshot=False
 EOF
   if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_sysconfig_file_issue)})); fi
 
   step 5 "Enabling and restarting the virt-who service"
-  chkconfig virt-who on || result_code=$(($result_code|#{error_code(:virt_who_chkconfig_issue)}))
-  service virt-who restart || result_code=$(($result_code|#{error_code(:virt_who_service_issue)}))
+  systemctl enable virt-who || result_code=$(($result_code|#{error_code(:virt_who_systemctl_issue)}))
+  systemctl restart virt-who || result_code=$(($result_code|#{error_code(:virt_who_service_issue)}))
 else
   result_code=$(($result_code|#{error_code(:virt_who_too_old)}))
 fi
@@ -163,6 +166,18 @@ encrypted_password=$cr_password"
       end
     end
 
+    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? ? "\ninternal_debug=#{config.ahv_internal_debug}" : nil
+
+        "\nprism_central=#{prism_central}#{internal_debug}#{update_interval}"
+      else
+        ""
+      end
+    end
+
     def error_handling
       CONFIGURATION_RESULTS.map do |result|
         "[ $(($result_code&#{result.code})) -ge 1 ] && echo '#{result.message}'"
@@ -196,8 +211,8 @@ encrypted_password=$cr_password"
       "/etc/virt-who.d/#{identifier}.conf"
     end
 
-    def sysconfig_file_path
-      '/etc/sysconfig/virt-who'
+    def default_config_path
+      '/etc/virt-who.conf'
     end
 
     def identifier
@@ -229,7 +244,7 @@ encrypted_password=$cr_password"
       case config.hypervisor_type
       when 'libvirt'
         config.hypervisor_password.blank? ? LIBVIRT_FAKE_PASSWORD : config.hypervisor_password
-      when 'kubevirt' 
+      when 'kubevirt'
         config.hypervisor_password.blank? ? KUBEVIRT_FAKE_PASSWORD : config.hypervisor_password
       else
         config.hypervisor_password
@@ -271,8 +286,8 @@ encrypted_password=$cr_password"
     def proxy_strings
       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.present? && !no_proxy.present?
+      output << "\nno_proxy=#{sanitize_proxy(no_proxy)}" if no_proxy.present?
+      output << "\nno_proxy=*" if !proxy.present? && !no_proxy.present?
       output
     end
 

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

@@ -9,7 +9,8 @@ end
 attributes :name, :interval, :organization_id, :whitelist, :blacklist, :hypervisor_id,
            :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
+           :filter_host_parents, :exclude_host_parents, :kubeconfig_path,
+           :prism_flavor, :ahv_update_interval, :ahv_internal_debug
 
 child :http_proxy do
   attributes :id, :name, :url

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

@@ -37,7 +37,7 @@
           <%= config_attribute :hypervisor_server, @config.hypervisor_server %>
           <%= config_attribute :hypervisor_username, @config.hypervisor_username if @config.hypervisor_type != 'kubevirt' %>
           <%= config_attribute :interval, _(ForemanVirtWhoConfigure::Config::AVAILABLE_INTERVALS[@config.interval.to_s]) %>
-          <%= config_attribute :satellite_url, @config.satellite_url, _('Satellite server FQDN')%>
+          <%= config_attribute :satellite_url, @config.satellite_url, _('Foreman server FQDN')%>
           <%= config_attribute :hypervisor_id, @config.hypervisor_id, _('Hypervisor ID') %>
           <%= config_attribute :listing_mode, _(ForemanVirtWhoConfigure::Config::FILTERING_MODES[@config.listing_mode.to_s]), _('Filtering') %>
           <% if @config.listing_mode == ForemanVirtWhoConfigure::Config::WHITELIST %>
@@ -52,6 +52,9 @@
           <%= config_attribute :http_proxy_id, @config.http_proxy.full_url, _('HTTP Proxy') if @config.http_proxy.present? %>
           <%= 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>
     </div>
@@ -62,7 +65,7 @@
       <div class="form-group">
         <div class="row">
           <div class="col-md-6">
-            <%= _("Use either hammer command or the script below to deploy this configuration. Both require root privileges. Run one of them on the target host which has access to Red Hat Satellite Tools repository and will run virt-who reporting, preferably Satellite host:") %>
+            <%= _("Use either hammer command or the script below to deploy this configuration. Both require root privileges. Run one of them on the target host which has access to katello-host-tools repository and will run virt-who reporting, preferably Foreman host:") %>
           </div>
         </div>
 

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

@@ -1,10 +1,10 @@
 <div id="config_connection">
-  <%= text_f f, :satellite_url, inline_help_popover(_('Satellite Server’s fully-qualified host name, for example: satellite.example.com')).merge(:label => _('Satellite 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')) %>
   <%= 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.
                               Default is <b>hostname</b>, which provides more meaningful hypervisor
-                                  names, but can cause duplicated hypervisor registrations if the host is renamed. To avoid that, you can use <b>uuid</b> instead. <b>hwuuid</b> is applicable to esx and rhevm only.
+                                  names, but can cause duplicated hypervisor registrations if the host is renamed. To avoid that, you can use <b>uuid</b> instead. <b>hwuuid</b> is applicable to esx only.
                                   This property is meant to be set up before the initial run of virt-who. Changing it later will result in duplicated entries in the subscription manager.").html_safe)) %>
   <%= selectable_f f, :listing_mode, ForemanVirtWhoConfigure::Config::FILTERING_MODES.map { |k,v| [_(v), k] }, {}, { :label => _('Filtering') }.merge(
         inline_help_popover(_("If you run a hybrid environment, with virtual machines running Red Hat Enterprise Linux and other operating systems, you may want to limit the scope of virt-who’s access to hosts. For example, if some hypervisors host only Microsoft Windows Server instances, there is no benefit in having those hypervisors reported by the virt-who agent."))) %>
@@ -13,13 +13,19 @@
 
   <%= textarea_f f, :blacklist, inline_help_popover(_('Hosts which uuid (or hostname or hwuuid, based on <code>hypervisor_id</code>) is specified in comma-separated list in this option will <b>NOT</b> be reported. 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 hosts')) %>
 
-  <%= textarea_f f, :filter_host_parents, inline_help_popover(_('Only hosts which parent (usually ComputeResource) name is specified in comma-separated list in this option will be reported. 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 => _('Filter host parents')) %>
+  <%= textarea_f f, :filter_host_parents, inline_help_popover(_('Only hosts which cluster ID is specified in comma-separated list in this option will 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 => _('Filter host parents')) %>
 
-  <%= textarea_f f, :exclude_host_parents, inline_help_popover(_('Hosts which parent (usually ComputeResource) name is specified in comma-separated list in this option will <b>NOT</b> be reported. 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')) %>
+  <%= 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(
         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')) %>
+
+  <%= 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/db/migrate/20210608100743_delete_rhevm_profiles.rb

@@ -0,0 +1,5 @@
+class DeleteRhevmProfiles < ActiveRecord::Migration[6.0]
+  def change
+    ForemanVirtWhoConfigure::Config.where(:hypervisor_type => 'rhevm').destroy_all
+  end
+end

data/db/migrate/20210910184516_add_ahv_to_config.rb

@@ -0,0 +1,7 @@
+class AddAhvToConfig < ActiveRecord::Migration[6.0]
+  def change
+    add_column :foreman_virt_who_configure_configs, :prism_flavor, :string, :null => true
+    add_column :foreman_virt_who_configure_configs, :ahv_update_interval, :integer, :null => true
+    add_column :foreman_virt_who_configure_configs, :ahv_internal_debug, :boolean, :null => true
+  end
+end

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.5.9'.freeze
 end

data/locale/action_names.rb

@@ -1,9 +1,30 @@
 # Autogenerated!
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
 _("Create")
+_("Delete Activation Key")
+_("Update")
+_("Generate host applicability")
+_("Bulk generate applicability for hosts")
+_("Generate repository applicability")
+_("Synchronize smart proxy")
+_("Sync capsule")
 _("Delete")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Promote")
+_("Promotion to Environment")
+_("Publish")
+_("Remove Versions and Associations")
+_("Remove from Environment")
+_("Remove Version")
 _("Export")
 _("Incremental Update")
+_("Republish Version Repositories")
 _("Delete Lifecycle Environment")
+_("Publish Lifecycle Environment Repositories")
 _("Attach subscriptions")
 _("Auto attach subscriptions")
 _("Destroy Content Host")
@@ -16,46 +37,35 @@ _("Remove package")
 _("Update package")
 _("Install package group")
 _("Remove package group")
-_("Register Host")
 _("Remove subscriptions")
-_("Unregister Host")
+_("Update Content Overrides")
 _("Update for host")
+_("Update release version for host")
 _("Package Profile Update")
-_("Auto-attach subscriptions")
+_("Combined Profile Update")
 _("Destroy")
 _("Product Create")
 _("Delete Product")
 _("Reindex subscriptions")
-_("Update")
-_("Errata mail")
+_("Update http proxy")
+_("Delete Package Group")
+_("Discover")
+_("Fetch pxe files")
 _("Filtered index content")
 _("Upload into")
 _("Index content")
 _("Index errata")
+_("Index module streams")
 _("Index package groups")
+_("Instance update")
 _("Remove Content")
 _("Synchronize")
+_("Update content urls")
+_("Update http proxy details")
+_("Update redhat repository")
 _("Upload errata into")
+_("Create Package Group")
 _("Disable")
 _("Enable")
-_("Add Sync Plan Products")
-_("Update Sync Plan Products")
-_("Update Sync Plan")
-_("Remote action:")
-_("Report")
-_("Action with sub plans")
-_("Create architecture")
-_("Delete architecture")
-_("Update architecture")
-_("Import facts")
-_("Import Puppet classes")
-_("Abstract async task")
-_("Delete Activation Key")
-_("Configure capsule")
-_("Create repos")
-_("Synchronize capsule content")
-_("Promotion")
-_("Publish")
-_("Remove from Environment")
-_("Remove Version")
-_("Remove Versions and Associations")
+_("Run Sync Plan:")
+_("Report")