hammer_cli_foreman_virt_who_configure 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c96871810cee34bc4e5b2ac7ff1b15edf614dbc2619b8b07b65cd1b56370a5
-  data.tar.gz: 12687b71a396b7c7293c71f4d1c675bd77ba60a90dd84fb6ac42a4b180da2b1c
+  metadata.gz: 36e2261f8c32cd0906a348f9920af4f7cbd8acd74ad7c78447c48e020a42a925
+  data.tar.gz: cd292789c8ceea3321fb0a091ba190dbe489f2fcc4b7937ba35a58698748af0b
 SHA512:
-  metadata.gz: 24848ae6e6b22fe1ac9d6e20660d0bc7ff59825772bf9d8ed391d8ef4c68a0278e688db91f1a5497df449b9056016e0359a5af5bb6c66840be23a36e99e6d315
-  data.tar.gz: e26889b6dabf00f5659ce741b6351d8f003d26de15102adde7e554d8cea5eae00197fee6e3b65035a5791c43e369b3b3d43bf176e2f849a0784909ca4958783c
+  metadata.gz: d71a9bf91cde3e5840bf83b4ed13cf00f20ccc5b670fc601b9cce0728806f66bab53ee0b8a5c9a8a5c7b0811648dd3dbc3558f238b2f1055754a37a291814ab2
+  data.tar.gz: 93dfa03a8a0fa04c0fca4a90c4f7352d8d949a2862ae7f18cd9937815aec74cca48c99e1a724e3eed7e5c92c4f02d47e6f61d7804756a609bf1cc03ff52a0799

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_update_interval", "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,9 @@ 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_update_interval, _('AHV update frequency'), Fields::Field, :hide_blank => true
+          field :ahv_internal_debug, _('Enable AHV debug'), Fields::Boolean
           field :_status, _('Status')
         end
         label _('Schedule') do
@@ -112,7 +121,7 @@ module HammerCLIForemanVirtWhoConfigure
         else
           conf['blacklist'] ||= " "
         end
-        conf
+        VirtWhoConfig.validate_hypervisor_options(conf)
       end
 
       build_options

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.0.9'
   end
 end

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.0.9
 platform: ruby
 authors:
 - Tomáš Strachota
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -100,13 +100,13 @@ signing_key:
 specification_version: 4
 summary: Plugin for configuring Virt Who
 test_files:
-- test/functional/test_helper.rb
-- 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_update_test.rb
+- test/functional/config/config_list_test.rb
+- test/functional/config/config_deploy_test.rb
+- test/functional/config/config_fetch_test.rb
+- test/functional/config/config_create_test.rb
+- test/functional/test_helper.rb
 - test/unit/system_caller_test.rb
-- test/data/1.15/foreman_api.json
 - test/test_helper.rb
+- test/data/1.15/foreman_api.json