foreman_virt_who_configure 0.5.4 → 0.5.8

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

@@ -17,7 +17,6 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
                                  :http_proxy_id => @http_proxy.id,
                                  :no_proxy => nil
     )
-
     @out_of_date_config = FactoryBot.create(:virt_who_config, :out_of_date)
     @ok_config = FactoryBot.create(:virt_who_config, :ok)
   end
@@ -78,7 +77,8 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     assert_equal 'unknown', response['status']
     assert_nil response['last_report_at']
     assert_nil response['out_of_date_at']
-    assert_equal @http_proxy.id, ForemanVirtWhoConfigure::Config.find(response['id']).http_proxy_id
+    assert_equal @http_proxy.id, response['http_proxy']['id']
+    assert_equal @http_proxy.url, response['proxy']
 
     assert_response :success
   end
@@ -127,6 +127,45 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     assert_equal @out_of_date_config.virt_who_config_script(:bash_script), response
   end
 
+  test 'should fail without kubeconfig_path in kubeconfig config' do
+    org = FactoryBot.create(:organization)
+    post :create, :params => { :foreman_virt_who_configure_config => { :name => 'my new config',
+                                                            :filtering_mode => ForemanVirtWhoConfigure::Config::UNLIMITED,
+                                                            :hypervisor_id => 'uuid',
+                                                            :hypervisor_type => 'kubevirt',
+                                                            :satellite_url => "foreman.example.com",
+                                                            :organization_id => org.id }
+    }, :session => set_session_user
+
+    assert_response :unprocessable_entity
+
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "Kubeconfig path can't be blank", response['error']['full_messages'].join('')
+  end
+
+  test 'should not accept kubeconfig for other hypervisor types' do
+    org = FactoryBot.create(:organization)
+    post :create, :params => { :foreman_virt_who_configure_config => { :name => 'my new config',
+                                                            :interval => 240,
+                                                            :filtering_mode => ForemanVirtWhoConfigure::Config::BLACKLIST,
+                                                            :blacklist => ' a,b ',
+                                                            :hypervisor_id => 'uuid',
+                                                            :hypervisor_type => 'esx',
+                                                            :hypervisor_server => "vmware.example.com",
+                                                            :hypervisor_username => "root",
+                                                            :hypervisor_password => "password",
+                                                            :debug => true,
+                                                            :satellite_url => "foreman.example.com",
+                                                            :kubeconfig_path => '/tmp/food',
+                                                            :organization_id => org.id }
+    }, :session => set_session_user
+
+    assert_response :unprocessable_entity
+
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "Kubeconfig path Invalid option for hypervisor [esx]", response['error']['full_messages'].join('')
+  end
+
   test "should create the config" do
     org = FactoryBot.create(:organization)
     post :create, :params => { :foreman_virt_who_configure_config => { :name => 'my new config',
@@ -140,6 +179,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 +198,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/output_generator_test.rb

@@ -60,7 +60,7 @@ module ForemanVirtWhoConfigure
         assert_nil config.http_proxy
         assert_nil config.no_proxy
         assert_not_includes output, 'http_proxy'
-        assert_includes output, 'NO_PROXY=*'
+        assert_includes output, 'no_proxy=*'
       end
 
       test 'it configures proxy when set' do
@@ -71,7 +71,7 @@ module ForemanVirtWhoConfigure
 
       test 'it configures no_proxy when set' do
         config.no_proxy = '*'
-        assert_includes output, 'NO_PROXY=*'
+        assert_includes output, 'no_proxy=*'
       end
 
       test 'proxy_strings prints both proxy and no proxy if present' do
@@ -79,19 +79,19 @@ module ForemanVirtWhoConfigure
         config.http_proxy = http_proxy
         config.no_proxy = 'b'
         assert_includes generator.proxy_strings, "\nhttp_proxy=http://test.com"
-        assert_includes generator.proxy_strings, "\NO_PROXY=b"
+        assert_includes generator.proxy_strings, "\nno_proxy=b"
       end
 
       test 'proxy_strings ignores empty string values' do
         config.http_proxy = nil
         config.no_proxy = ''
         assert_not_includes generator.proxy_strings, 'http_proxy'
-        assert_includes generator.proxy_strings, 'NO_PROXY=*'
+        assert_includes generator.proxy_strings, 'no_proxy=*'
       end
 
       test 'proxy_strings removes any new line chars' do
         config.no_proxy = "\nx\ny\nz"
-        assert_includes generator.proxy_strings, "\NO_PROXY=xyz"
+        assert_includes generator.proxy_strings, "\nno_proxy=xyz"
       end
 
       test 'it configures https proxy when https proxy is set' do
@@ -128,5 +128,29 @@ module ForemanVirtWhoConfigure
         assert_includes bash_script_output, 'step 1 "Installing virt-who"'
       end
     end
+
+    describe 'nutanix ahv' do
+      test 'options specific to ahv are all set' do
+        config.hypervisor_type = 'ahv'
+        config.prism_flavor = 'central'
+        config.ahv_update_interval = 100
+        config.ahv_internal_debug = true
+
+        assert_includes output, 'type=ahv'
+        assert_includes output, 'prism_central=true'
+        assert_includes output, 'update_interval=100'
+        assert_includes output, 'internal_debug=true'
+      end
+
+      test 'options specific to ahv are not all set' do
+        config.hypervisor_type = 'ahv'
+        config.prism_flavor = 'central'
+
+        assert_includes output, 'type=ahv'
+        assert_includes output, 'prism_central=true'
+        assert_not_includes output, 'update_interval='
+        assert_not_includes output, 'update_interval='
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.8
 platform: ruby
 authors:
 - Foreman virt-who-configure team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -108,16 +108,54 @@ files:
 - 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
+- db/migrate/20210608100743_delete_rhevm_profiles.rb
+- db/migrate/20210910184516_add_ahv_to_config.rb
 - lib/foreman_virt_who_configure.rb
 - lib/foreman_virt_who_configure/engine.rb
 - lib/foreman_virt_who_configure/version.rb
 - lib/tasks/foreman_virt_who_configure_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/ca/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/ca/foreman_virt_who_configure.po
+- locale/cs_CZ/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/cs_CZ/foreman_virt_who_configure.po
+- locale/de/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/de/foreman_virt_who_configure.po
 - locale/en/LC_MESSAGES/foreman_virt_who_configure.mo
 - locale/en/foreman_virt_who_configure.po
+- locale/en_GB/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/en_GB/foreman_virt_who_configure.po
+- locale/es/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/es/foreman_virt_who_configure.po
 - locale/foreman_virt_who_configure.pot
+- locale/fr/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/fr/foreman_virt_who_configure.po
 - locale/gemspec.rb
+- locale/gl/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/gl/foreman_virt_who_configure.po
+- locale/it/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/it/foreman_virt_who_configure.po
+- locale/ja/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/ja/foreman_virt_who_configure.po
+- locale/ko/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/ko/foreman_virt_who_configure.po
+- locale/nl_NL/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/nl_NL/foreman_virt_who_configure.po
+- locale/pl/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/pl/foreman_virt_who_configure.po
+- locale/pt_BR/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/pt_BR/foreman_virt_who_configure.po
+- locale/ru/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/ru/foreman_virt_who_configure.po
+- locale/sv_SE/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/sv_SE/foreman_virt_who_configure.po
+- locale/zh_CN/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/zh_CN/foreman_virt_who_configure.po
+- locale/zh_TW/LC_MESSAGES/foreman_virt_who_configure.mo
+- locale/zh_TW/foreman_virt_who_configure.po
 - test/factories/foreman_virt_who_configure_factories.rb
 - test/functional/api/v2/configs_controller_test.rb
 - test/test_plugin_helper.rb
@@ -128,7 +166,7 @@ homepage: https://github.com/theforeman/foreman_virt_who_configure
 licenses:
 - GPLv3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A plugin to make virt-who configuration easy
 test_files: