foreman_virt_who_configure 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0215d08a85e32061608ec7f2452a0d6df0cc73a322491582aa3704b43f81a0
-  data.tar.gz: 93df5caf56ec4158b525485a7f04656ef03a6a61b1b592c54c7c3397e09a488f
+  metadata.gz: 38a1caca71ecc26f921be69f4efe48943a0ac7b79a0b5a7cb2d99fe41bfc202f
+  data.tar.gz: 000115561c5ad123da017fb662913cb3dbbe2e1113adf23cc73315735c906022
 SHA512:
-  metadata.gz: 49be70fdb7fa4fda78219dbc332754ef38628749eda69499fdfdb238bc1aa6b2c5be9fe2c791d9e11b86ba7b34ac4196c51db467d99b522357467098eba12ed0
-  data.tar.gz: e05cf7553259f2303652c9d4fe72c0ebb05ac975dd2b41b31dfebff88b640a31d26186293e160b6e5b9dd25a2bc1baacceb3393ec6d12eb5e10bc29f327817ff
+  metadata.gz: e84d2ec1aa61e5f37e1354ece1ef2e04493623cd791d0b839f996270fa32bb652aaa96af7c365015f53638658a5064d6d13c14be61704f8a765208d190389e58
+  data.tar.gz: 5c3d700fc5babc9d73a53c77aab32b5e92f896818fa9903efdcc5f1350c94c0c776cc27ba564bd2b0826298eef0952a7da90ccc2ab2ff24ba5f9444e50ab83f3

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

@@ -52,7 +52,7 @@ module ForemanVirtWhoConfigure
             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 :debug, :bool, :desc => N_("Enable debugging output")
-            param :proxy, String, :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.'), :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]
           end

data/app/helpers/foreman_virt_who_configure/configs_helper.rb

@@ -4,9 +4,7 @@ module ForemanVirtWhoConfigure
       @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'),
-        # 'vdsm' => 'Red Hat Enterprise Linux Hypervisor (vdsm)',
         'hyperv' => _('Microsoft Hyper-V fully qualified host name or IP address.'),
-        'xen' => _('XenServer server’s 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.')
       }
@@ -16,9 +14,7 @@ module ForemanVirtWhoConfigure
       @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.'),
-        # 'vdsm' => '',
         '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.'),
-        'xen' => _('Account name by which virt-who is to connect to the hypervisor.'),
         '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' => ''
       }

data/app/models/foreman_virt_who_configure/config.rb

@@ -3,7 +3,7 @@ module ForemanVirtWhoConfigure
     PERMITTED_PARAMS = [
       :interval, :organization_id, :compute_resource_id, :whitelist, :blacklist, :hypervisor_id,
       :hypervisor_type, :hypervisor_server, :hypervisor_username, :hypervisor_password, :debug,
-      :satellite_url, :proxy, :no_proxy, :name,
+      :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
@@ -32,9 +32,7 @@ module ForemanVirtWhoConfigure
     HYPERVISOR_TYPES = {
       'esx' => 'VMware vSphere / vCenter (esx)',
       'rhevm' => 'Red Hat Virtualization Hypervisor (rhevm)',
-      # 'vdsm' => 'Red Hat Enterprise Linux Hypervisor (vdsm)',
       'hyperv' => 'Microsoft Hyper-V (hyperv)',
-      'xen' => 'XenServer (xen)',
       'libvirt' => 'libvirt',
       'kubevirt' => 'Container-native virtualization'
     }
@@ -73,6 +71,7 @@ module ForemanVirtWhoConfigure
 
     belongs_to :compute_resource
     belongs_to :organization
+    belongs_to :http_proxy
 
     # service user used by virt-who to report back
     belongs_to :service_user

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -83,8 +83,25 @@ verify_minimal_version() {
 }
 
 result_code=#{error_code(:success)}
+
+compose_install_command() {
+  $1 packages unlock
+  $1 advanced procedure run packages-install --packages virt-who --assumeyes || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
+  $1 packages lock
+}
+
+install_virt_who() {
+  if `rpm -q satellite-maintain > /dev/null`; then
+    compose_install_command satellite-maintain
+  elif `rpm -q rubygem-foreman_maintain > /dev/null`; then
+    compose_install_command foreman-maintain
+  else
+    yum install -y virt-who || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
+  fi
+}
+
 step 1 "Installing virt-who"
-yum install -y virt-who || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
+install_virt_who
 
 if verify_minimal_version; then
   step 2 "Encrypting password"
@@ -236,7 +253,7 @@ encrypted_password=$cr_password"
     end
 
     def proxy
-      config.proxy
+      config.http_proxy
     end
 
     def no_proxy
@@ -247,9 +264,13 @@ encrypted_password=$cr_password"
       sanitize(string)
     end
 
+    def proxy_type
+      "#{URI(proxy.url).scheme}_proxy"
+    end
+
     def proxy_strings
       output = ''
-      output << "\nhttp_proxy=#{sanitize_proxy(proxy)}" if proxy.present?
+      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

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

@@ -2,8 +2,17 @@ object @config
 
 extends "foreman_virt_who_configure/api/v2/configs/base"
 
+glue :http_proxy do
+  attributes :url => :proxy
+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
+           :filter_host_parents, :exclude_host_parents, :kubeconfig_path
+
+child :http_proxy do
+  attributes :id, :name, :url
+end
+
 attributes :listing_mode => :filtering_mode

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

@@ -2,12 +2,13 @@
 
 <%= breadcrumbs(:resource_url => foreman_virt_who_configure_api_configs_path,
                 :items => [
-                    {:caption => _('Configurations'),
-                     :url => url_for(foreman_virt_who_configure_configs_path)
-                    },
-                    {:caption => _('Edit') + ' ' + @config.name,
-                     :url => (edit_foreman_virt_who_configure_config_path(@config) if authorized_for(hash_for_edit_foreman_virt_who_configure_config_path(@config)))
-                    }
+                  {
+                    :caption => _('Virt-who Configurations'),
+                    :url => foreman_virt_who_configure_configs_path
+                  },
+                  {
+                    :caption => _('Edit') + ' ' + @config.name
+                  }
                 ]
     ) %>
 

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

@@ -8,12 +8,13 @@
 
 <%= breadcrumbs(:resource_url => foreman_virt_who_configure_api_configs_path,
                 :items => [
-                    {:caption => _('Configurations'),
-                     :url => url_for(foreman_virt_who_configure_configs_path)
-                    },
-                    {:caption => @config.name,
-                     :url => (edit_foreman_virt_who_configure_config_path(@config) if authorized_for(hash_for_edit_foreman_virt_who_configure_config_path(@config)))
-                    }
+                  {
+                    :caption => _('Virt-who Configurations'),
+                    :url => foreman_virt_who_configure_configs_path
+                  },
+                  {
+                    :caption => @config.name
+                  }
                 ]
     ) %>
 
@@ -48,7 +49,7 @@
             <%= config_attribute :exclude_host_parents, @config.exclude_host_parents if @config.exclude_host_parents.present? %>
           <% end %>
           <%= config_attribute :debug, checked_icon(@config.debug), _('Enable debugging output?') %>
-          <%= config_attribute :proxy, @config.proxy, _('HTTP Proxy') if @config.proxy.present? %>
+          <%= 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' %>
         </div>

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

@@ -18,7 +18,8 @@
   <%= 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')) %>
 
   <%= 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."))) %>
-  <%= text_f f, :proxy, 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.')).merge(:label => _('HTTP proxy')) %>
+  <%= 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')) %>
 </div>

data/db/migrate/20200728054557_refer_config_proxy_to_http_proxy.rb

@@ -0,0 +1,74 @@
+class ReferConfigProxyToHttpProxy < ActiveRecord::Migration[6.0]
+  def up
+    add_column :foreman_virt_who_configure_configs, :http_proxy_id, :integer
+
+    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+      User.as_anonymous_admin do
+        http_proxies = HttpProxy.all
+        ::ForemanVirtWhoConfigure::Config.find_each do |config|
+          if config.proxy.present?
+            migrate_config(http_proxies, config)
+          end
+        end
+      end
+    end
+
+    remove_column :foreman_virt_who_configure_configs, :proxy
+  end
+
+  def down
+    add_column :foreman_virt_who_configure_configs, :proxy, :string
+
+    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+      User.as_anonymous_admin do
+        ::ForemanVirtWhoConfigure::Config.find_each do |config|
+          if config.http_proxy_id.present?
+            config.proxy = config.http_proxy.full_url
+            config.save!
+          end
+        end
+      end
+    end
+
+    remove_column :foreman_virt_who_configure_configs, :http_proxy_id
+  end
+
+  private
+
+  def migrate_config(http_proxies, config)
+    http_proxy = http_proxies.find { |proxy| proxy.full_url == proxy_uri(config.proxy).to_s }
+
+    if http_proxy.present?
+      config.http_proxy = http_proxy
+    else
+      http_proxy = build_http_proxy(config.proxy)
+      if http_proxy.save
+        config.http_proxy_id = http_proxy.id
+      end
+    end
+
+    config.save!
+  rescue URI::InvalidURIError
+    Rails.logger.debug "Config with id #{config.id} has not valid proxy #{config.proxy}"
+  end
+
+  def proxy_uri(config_proxy)
+    uri = URI(config_proxy)
+    unless ['http', 'https'].include? uri.scheme
+      config_proxy = "http://#{config_proxy}"
+      uri = URI(config_proxy)
+    end
+    uri
+  end
+
+  def build_http_proxy(proxy_url)
+    uri = proxy_uri(proxy_url)
+    url = if uri.port
+            "#{uri.scheme}://#{uri.host}:#{uri.port.to_s}"
+          else
+            "#{uri.scheme}://#{uri.host}"
+          end
+
+    HttpProxy.new(name: "virt_who_#{uri.host}", url: url, username: uri.user, password: uri.password)
+  end
+end

data/db/migrate/20201211160234_add_foreign_key_proxy_id.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyProxyId < ActiveRecord::Migration[6.0]
+  def change
+    add_foreign_key :foreman_virt_who_configure_configs, :http_proxies, :column => :http_proxy_id
+  end
+end

data/db/migrate/20210413165147_delete_xen_profiles.rb

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

data/lib/foreman_virt_who_configure/version.rb

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

data/test/functional/api/v2/configs_controller_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController::TestCase
   setup do
+    @http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://test.com")
     @new_config = FactoryBot.create(:virt_who_config,
                                  :name => 'my vmware',
                                  :interval => 120,
@@ -13,7 +14,7 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
                                  :hypervisor_username => "root",
                                  :debug => false,
                                  :satellite_url => "foreman.example.com",
-                                 :proxy => 'proxy.example.com',
+                                 :http_proxy_id => @http_proxy.id,
                                  :no_proxy => nil
     )
 
@@ -41,7 +42,6 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     refute result_config['debug']
     assert_not_nil result_config['debug']
     assert_equal 'foreman.example.com', result_config['satellite_url']
-    assert_equal 'proxy.example.com', result_config['proxy']
     assert_nil result_config['no_proxy']
     assert_equal 'unknown', result_config['status']
     assert_nil result_config['last_report_at']
@@ -74,11 +74,12 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     refute response['debug']
     assert_not_nil response['debug']
     assert_equal 'foreman.example.com', response['satellite_url']
-    assert_equal 'proxy.example.com', response['proxy']
     assert_nil response['no_proxy']
     assert_equal 'unknown', response['status']
     assert_nil response['last_report_at']
     assert_nil response['out_of_date_at']
+    assert_equal @http_proxy.id, response['http_proxy']['id']
+    assert_equal @http_proxy.url, response['proxy']
 
     assert_response :success
   end
@@ -140,6 +141,7 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
                                                             :hypervisor_password => "password",
                                                             :debug => true,
                                                             :satellite_url => "foreman.example.com",
+                                                            :http_proxy_id => @http_proxy.id,
                                                             :organization_id => org.id }
     }, :session => set_session_user
 
@@ -158,6 +160,7 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     assert_equal 'password', new_config.hypervisor_password
     assert_equal true, new_config.debug
     assert_equal 'foreman.example.com', new_config.satellite_url
+    assert_equal @http_proxy.id, response['http_proxy']['id']
   end
 
   test "should update the config" do

data/test/unit/migrate_config_proxy_to_http_proxy.rb

@@ -0,0 +1,158 @@
+require 'test_plugin_helper'
+require ForemanVirtWhoConfigure::Engine.root.join('db', 'migrate', '20200728054557_refer_config_proxy_to_http_proxy.rb')
+
+module ForemanVirtWhoConfigure
+  class MigrateConfigProxyToHttpProxy < ActiveSupport::TestCase
+    let(:migration) { klass.new }
+
+    def migration_has_been_run?(version)
+      ActiveRecord::SchemaMigration.where(version: version).exists?
+    end
+
+    describe "up" do
+      let(:config) { FactoryBot.build(:virt_who_config) }
+
+      before do
+        if migration_has_been_run?('20200728054557')
+          migration.down
+        end
+
+        HttpProxy.delete_all
+      end
+
+      it "should create Http Proxy if already not exist" do
+        config.proxy = "test.example.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_equal "http://test.example.com", created_http_proxy.full_url
+      end
+
+      it "should create Http Proxy with user and password if already not exist" do
+        config.proxy = "http://user:password@test.example.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_equal "http://user:password@test.example.com", created_http_proxy.full_url
+        assert_equal "user", created_http_proxy.username
+        assert_equal "password", created_http_proxy.password
+      end
+
+      it "should not create Http Proxy for invalid config proxy if already not exist" do
+        config.proxy = "test.example.com:5000"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_equal "http://test.example.com:5000", created_http_proxy.full_url
+      end
+
+      it "should create Http Proxy with port for config proxy if already not exist" do
+        config.proxy = "https://test.example.com:5000"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_equal "https://test.example.com:5000", created_http_proxy.full_url
+      end
+
+      it "should refer to existed Http Proxy" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://test.com")
+        config.proxy = "http://test.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 0) do
+          migration.up
+        end
+
+        assert_equal updated_config.http_proxy_id, http_proxy.id
+      end
+
+      it "should refer to existed IP address http proxy" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://212.212.10.23")
+        config.proxy = "212.212.10.23"
+        config.save!
+
+        assert_difference('HttpProxy.count', 0) do
+          migration.up
+        end
+
+        assert_equal updated_config.http_proxy_id, http_proxy.id
+      end
+
+      it "should create new http proxy if user and password is present" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://proxy.example.com", username: "admin", password: "pass")
+        config.proxy = "http://proxy.example.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_not_equal updated_config.http_proxy_id, http_proxy.id
+        assert_equal updated_config.http_proxy_id, created_http_proxy.id
+        assert_equal "http://proxy.example.com", created_http_proxy.full_url
+      end
+
+      it "refer to http proxy if user and password is present" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://proxy.example.com", username: "admin", password: "pass")
+        config.proxy = "http://admin:pass@proxy.example.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 0) do
+          migration.up
+        end
+
+        assert_equal updated_config.http_proxy_id, http_proxy.id
+      end
+
+      it "should create new http proxy if port is there" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://proxy.example.com:5000")
+        config.proxy = "http://proxy.example.com"
+        config.save!
+
+        assert_difference('HttpProxy.count', 1) do
+          migration.up
+        end
+
+        assert_not_equal updated_config.http_proxy_id, http_proxy.id
+        assert_equal updated_config.http_proxy_id, created_http_proxy.id
+        assert_equal "http://proxy.example.com", created_http_proxy.full_url
+      end
+
+      it "should refer to existed http proxy if port is there and config proxy has also same port" do
+        http_proxy = FactoryBot.create(:http_proxy, name: "test", url: "http://proxy.example.com:5000")
+        config.proxy = "http://proxy.example.com:5000"
+        config.save!
+
+        assert_difference('HttpProxy.count', 0) do
+          migration.up
+        end
+
+        assert_equal updated_config.http_proxy_id, http_proxy.id
+      end
+    end
+
+    def klass
+      ReferConfigProxyToHttpProxy
+    end
+
+    def updated_config
+      ::ForemanVirtWhoConfigure::Config.last
+    end
+
+    def created_http_proxy
+      HttpProxy.order(:id).last
+    end
+  end
+end

data/test/unit/output_generator_test.rb

@@ -57,15 +57,16 @@ module ForemanVirtWhoConfigure
 
     describe 'proxy attributes' do
       test 'it does not set any proxy attributes by default and set no_proxy to * to bypass sub-man proxy' do
-        assert_nil config.proxy
+        assert_nil config.http_proxy
         assert_nil config.no_proxy
         assert_not_includes output, 'http_proxy'
         assert_includes output, 'NO_PROXY=*'
       end
 
       test 'it configures proxy when set' do
-        config.proxy = 'http://proxy.com'
-        assert_includes output, 'http_proxy=http://proxy.com'
+        http_proxy = HttpProxy.create!(name: "test", url: "http://test.com")
+        config.http_proxy = http_proxy
+        assert_includes output, 'http_proxy=http://test.com'
       end
 
       test 'it configures no_proxy when set' do
@@ -74,25 +75,30 @@ module ForemanVirtWhoConfigure
       end
 
       test 'proxy_strings prints both proxy and no proxy if present' do
-        config.proxy = 'a'
+        http_proxy = HttpProxy.create!(name: "test", url: "http://test.com")
+        config.http_proxy = http_proxy
         config.no_proxy = 'b'
-        assert_includes generator.proxy_strings, "\nhttp_proxy=a"
+        assert_includes generator.proxy_strings, "\nhttp_proxy=http://test.com"
         assert_includes generator.proxy_strings, "\NO_PROXY=b"
       end
 
       test 'proxy_strings ignores empty string values' do
-        config.proxy = ''
+        config.http_proxy = nil
         config.no_proxy = ''
         assert_not_includes generator.proxy_strings, 'http_proxy'
         assert_includes generator.proxy_strings, 'NO_PROXY=*'
       end
 
       test 'proxy_strings removes any new line chars' do
-        config.proxy = "\na\nb\nc\n"
         config.no_proxy = "\nx\ny\nz"
-        assert_includes generator.proxy_strings, "\nhttp_proxy=abc"
         assert_includes generator.proxy_strings, "\NO_PROXY=xyz"
       end
+
+      test 'it configures https proxy when https proxy is set' do
+        http_proxy = HttpProxy.create!(name: "test", url: "https://test.com")
+        config.http_proxy = http_proxy
+        assert_includes output, 'https_proxy=https://test.com'
+      end
     end
 
     describe 'error codes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.6
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -107,6 +107,9 @@ files:
 - db/migrate/20170407152851_add_name_to_config.rb
 - db/migrate/20181005065724_filter_and_exclude_host_parents.foreman_virt_who_configure.rb
 - db/migrate/20190104125749_add_kubeconfig_to_config.rb
+- db/migrate/20200728054557_refer_config_proxy_to_http_proxy.rb
+- db/migrate/20201211160234_add_foreign_key_proxy_id.rb
+- db/migrate/20210413165147_delete_xen_profiles.rb
 - lib/foreman_virt_who_configure.rb
 - lib/foreman_virt_who_configure/engine.rb
 - lib/foreman_virt_who_configure/version.rb
@@ -121,6 +124,7 @@ files:
 - test/functional/api/v2/configs_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/config_test.rb
+- test/unit/migrate_config_proxy_to_http_proxy.rb
 - test/unit/output_generator_test.rb
 homepage: https://github.com/theforeman/foreman_virt_who_configure
 licenses:
@@ -141,13 +145,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A plugin to make virt-who configuration easy
 test_files:
 - test/factories/foreman_virt_who_configure_factories.rb
-- test/test_plugin_helper.rb
+- test/functional/api/v2/configs_controller_test.rb
+- test/unit/migrate_config_proxy_to_http_proxy.rb
 - test/unit/config_test.rb
 - test/unit/output_generator_test.rb
-- test/functional/api/v2/configs_controller_test.rb
+- test/test_plugin_helper.rb