hammer_cli_foreman_virt_who_configure 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c96871810cee34bc4e5b2ac7ff1b15edf614dbc2619b8b07b65cd1b56370a5
-  data.tar.gz: 12687b71a396b7c7293c71f4d1c675bd77ba60a90dd84fb6ac42a4b180da2b1c
+  metadata.gz: aa67ec96782ac99c36a99614216817e60422d1b7b7ef99f21152c806a610560f
+  data.tar.gz: 3f3b9692d4eb19636b444aed17ae030a4dcb31b5a5963eadaab16305c7740832
 SHA512:
-  metadata.gz: 24848ae6e6b22fe1ac9d6e20660d0bc7ff59825772bf9d8ed391d8ef4c68a0278e688db91f1a5497df449b9056016e0359a5af5bb6c66840be23a36e99e6d315
-  data.tar.gz: e26889b6dabf00f5659ce741b6351d8f003d26de15102adde7e554d8cea5eae00197fee6e3b65035a5791c43e369b3b3d43bf176e2f849a0784909ca4958783c
+  metadata.gz: 7b4f624d8ef5af1d65781be5511f292cde27dbc52ba095eec6fd3871b3244466af51fe67d7ca19b36fcea2ca05a51d28d93da195d6fa67759bea337b3019456a
+  data.tar.gz: 5180c3415c4d94a6721b589a17761cbd04da023ed433075177efb61a73b2cde5fb7c91a7004ff61aed04524684c3c68285a6b116e6a0d12fdc49af470063a930

data/lib/hammer_cli_foreman_virt_who_configure/config.rb

@@ -43,6 +43,12 @@ module HammerCLIForemanVirtWhoConfigure
       end
     end
 
+    def self.validate_hypervisor_options(conf)
+      options = conf["hypervisor_type"] == 'kubevirt' ? %w(hypervisor_server hypervisor_username) : %w(kubeconfig_path)
+      options.append("prism_flavor", "ahv_internal_debug") unless conf["hypervisor_type"] == 'ahv'
+      conf.delete_if { |k, v| options.include?(k) }
+    end
+
     class ListCommand < HammerCLIForeman::ListCommand
       output do
         field :id, _('Id')
@@ -70,6 +76,8 @@ module HammerCLIForemanVirtWhoConfigure
           field :hypervisor_server, _('Hypervisor server')
           field :hypervisor_username, _('Hypervisor username')
           field :kubeconfig_path, _('Configuration file'), Fields::Field, :hide_blank => true
+          field :prism_flavor, _('AHV Prism flavor'), Fields::Field, :hide_blank => true
+          field :ahv_internal_debug, _('Enable AHV debug'), Fields::Boolean
           field :_status, _('Status')
         end
         label _('Schedule') do
@@ -112,7 +120,7 @@ module HammerCLIForemanVirtWhoConfigure
         else
           conf['blacklist'] ||= " "
         end
-        conf
+        VirtWhoConfig.validate_hypervisor_options(conf)
       end
 
       build_options
@@ -130,7 +138,7 @@ module HammerCLIForemanVirtWhoConfigure
         data = send_request
         if option_output
           path = File.expand_path(option_output)
-          if File.exists?(path)
+          if File.exist?(path)
             # this could be a security issue, the file should be readable only by the user
             output.print_error(
               _('Could not save the script'),
@@ -138,7 +146,7 @@ module HammerCLIForemanVirtWhoConfigure
             )
             return HammerCLI::EX_USAGE
           else
-            File.write(path, data, { :perm => 0700, :mode => File::RDWR|File::CREAT|File::EXCL })
+            File.write(path, data, perm: 0700, mode: File::RDWR|File::CREAT|File::EXCL)
             return HammerCLI::EX_OK
           end
         else

data/lib/hammer_cli_foreman_virt_who_configure/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanVirtWhoConfigure
   def self.version
-    @version ||= Gem::Version.new '0.0.8'
+    @version ||= Gem::Version.new '0.1.0'
   end
 end

data/test/functional/config/config_create_test.rb

@@ -29,42 +29,42 @@ describe "virt-who-config" do
 
     it "requires --filtering-mode" do
       params = hash_to_opts(@required_args, :reject => :filtering_mode)
-      assert_requires_argument(@cmd, params, 'filtering_mode')
+      assert_requires_argument(@cmd, params, 'filtering-mode')
     end
 
     it "requires --hypervisor-id" do
       params = hash_to_opts(@required_args, :reject => :hypervisor_id)
-      assert_requires_argument(@cmd, params, 'hypervisor_id')
+      assert_requires_argument(@cmd, params, 'hypervisor-id')
     end
 
     it "validates --hypervisor-id values" do
       params = hash_to_opts(@required_args.merge(:hypervisor_id => 'other'))
-      assert_usage_error(@cmd, params, "option '--hypervisor-id': value must be one of 'hostname', 'uuid', 'hwuuid'")
+      assert_usage_error(@cmd, params, "Option '--hypervisor-id': Value must be one of 'hostname', 'uuid', 'hwuuid'..")
     end
 
     it "requires --hypervisor-type" do
       params = hash_to_opts(@required_args, :reject => :hypervisor_type)
-      assert_requires_argument(@cmd, params, 'hypervisor_type')
+      assert_requires_argument(@cmd, params, 'hypervisor-type')
     end
 
     it "validates --hypervisor-type values" do
       params = hash_to_opts(@required_args.merge(:hypervisor_type => 'other'))
-      assert_usage_error(@cmd, params, "option '--hypervisor-type': value must be one of 'esx', 'rhevm', 'hyperv', 'xen', 'libvirt'")
+      assert_usage_error(@cmd, params, "Option '--hypervisor-type': Value must be one of 'esx', 'rhevm', 'hyperv', 'xen', 'libvirt'..")
     end
 
     it "requires --hypervisor-server" do
       params = hash_to_opts(@required_args, :reject => :hypervisor_server)
-      assert_requires_argument(@cmd, params, 'hypervisor_server')
+      assert_requires_argument(@cmd, params, 'hypervisor-server')
     end
 
     it "requires --hypervisor-username" do
       params = hash_to_opts(@required_args, :reject => :hypervisor_username)
-      assert_requires_argument(@cmd, params, 'hypervisor_username')
+      assert_requires_argument(@cmd, params, 'hypervisor-username')
     end
 
     it "requires --satellite-url" do
       params = hash_to_opts(@required_args, :reject => :satellite_url)
-      assert_requires_argument(@cmd, params, 'satellite_url')
+      assert_requires_argument(@cmd, params, 'satellite-url')
     end
 
     it "sends values to api" do

data/test/functional/test_helper.rb

@@ -7,7 +7,7 @@ include HammerCLI::Testing::CommandAssertions
 include HammerCLI::Testing::OutputMatchers
 
 def missing_arguments_result(argument_name)
-  HammerCLI::Testing::CommandAssertions::CommandExpectation.new('', /Missing arguments for.*\[#{argument_name}\]/, HammerCLI::EX_USAGE)
+  HammerCLI::Testing::CommandAssertions::CommandExpectation.new('', /Missing arguments for.*#{argument_name}/, HammerCLI::EX_USAGE)
 end
 
 def assert_requires_argument(cmd, params, required_argument_name)

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'minitest/spec'
 require "mocha/setup"
+require "mocha/minitest"
 
 require 'hammer_cli'
 require 'hammer_cli_foreman/testing/api_expectations'

data/test/unit/system_caller_test.rb

@@ -16,7 +16,8 @@ describe "SystemCaller" do
 
   it 'uses tempfile for executing the script' do
     tmp_file = CaptureContentTempfile.new
-    Kernel.expects(:system).with("/usr/bin/bash #{tmp_file.path}")
+    vars = HammerCLIForemanVirtWhoConfigure::SystemCaller.new.clean_env_vars
+    Kernel.expects(:system).with(vars, "/usr/bin/bash #{tmp_file.path}", unsetenv_others: true)
 
     sys_caller = HammerCLIForemanVirtWhoConfigure::SystemCaller.new(tmp_file)
     sys_caller.system(script)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomáš Strachota
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -54,6 +54,7 @@ files:
 - lib/hammer_cli_foreman_virt_who_configure/system_caller.rb
 - lib/hammer_cli_foreman_virt_who_configure/version.rb
 - locale/ca/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
+- locale/cs_CZ/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/de/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/en/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/en_GB/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
@@ -61,6 +62,7 @@ files:
 - locale/fr/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/it/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/ja/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
+- locale/ka/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/ko/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/pt_BR/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
 - locale/ru/LC_MESSAGES/hammer-cli-foreman-virt-who-configure.mo
@@ -80,7 +82,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman-virt-who-configure
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,18 +97,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.2.33
+signing_key: 
 specification_version: 4
 summary: Plugin for configuring Virt Who
 test_files:
-- test/functional/test_helper.rb
+- test/data/1.15/foreman_api.json
 - test/functional/config/config_create_test.rb
 - test/functional/config/config_deploy_test.rb
-- test/functional/config/config_list_test.rb
 - test/functional/config/config_fetch_test.rb
 - test/functional/config/config_info_test.rb
+- test/functional/config/config_list_test.rb
 - test/functional/config/config_update_test.rb
-- test/unit/system_caller_test.rb
-- test/data/1.15/foreman_api.json
+- test/functional/test_helper.rb
 - test/test_helper.rb
+- test/unit/system_caller_test.rb