hammer_cli_foreman 3.15.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4080ad3a471b47ea68f872665fca82acc64f2288483fa77d487026c9765eea6
-  data.tar.gz: c57ca48ff2872564c096cea2083cf233cdc862d65b19f7202cb0e20da48845d4
+  metadata.gz: 19aecc76c45aea21d165a63bf62ce10fec9774e4d552fd34e176dae195dcaf23
+  data.tar.gz: 18d5e71e31373b5b4ac1d744712f9a77b8a263e9eb612690f94b63f49eb5d0dd
 SHA512:
-  metadata.gz: 444c1c313da816ecffc0e4d6c45d07977cc855168830cdb1393dba2b0d4cf135353a25acf955f0cfec172d069087ed9c1c08f0153db630d33cf9f7dd68589079
-  data.tar.gz: 41dc813d04ca7ad2090c220701371b701bde0be770b8e464417fad8226856a70cbb5f22508d44a836fcb38603197348f3fec3a670a204cfa983adde3c12525a5
+  metadata.gz: ecd60a4cadea52d36350b5dc32a42a5741dab3bb2d99bc5568754879b55b2521c3f9da136490dfbde9d7ea745349ecdc2693dd2b0f50db7605f2ca460be29cd7
+  data.tar.gz: ae9865919068552dcafdf72d1d8da6a35f2b3d999c7d88251849e75c83bb54d9dba9e7982a5f91d5be735545e1f6d5928a224e999f6a2da6ef92ab81b263b035

data/doc/host_create.md

@@ -225,33 +225,6 @@ security_groups
 network
 ```
 
-## oVirt
-Available keys for `--compute-attributes`:
-```
-cluster
-template   # hardware profile to use
-cores      # int value, number of cores
-sockets    # int value, number of sockets
-memory     # amount of memory, int value in bytes
-start      # Must be a 1 or 0, whether to start the machine or not
-```
-
-Available keys for `--interface`:
-```
-compute_name         # eg. eth0
-compute_network      # select one of available networks for a cluster
-compute_interface    # interface type
-```
-
-Available keys for `--volume`:
-```
-size_gb            # volume size in GB, integer value
-storage_domain     # select one of available storage domains
-bootable           # boolean, only one volume can be bootable
-preallocate        # boolean, set true to preallocate
-wipe_after_delete  # boolean, set true to wipe disk after delete
-```
-
 ## VMware
 Available keys for `--compute-attributes`:
 ```

data/doc/release_notes.md

@@ -1,5 +1,17 @@
 Release notes
 =============
+### 3.17.0 (2025-11-11)
+* Add packit commit trigger job
+* Remove options related to filter overrides ([PR #645](https://github.com/theforeman/hammer-cli-foreman/pull/645)), [#38805](http://projects.theforeman.org/issues/38805)
+* Add github actions workflow for releases
+* Expose cloned from id in template info command
+* Bump to 3.17.0-develop
+
+### 3.16.0 (2025-08-13)
+* Ldap group membership ([PR #641](https://github.com/theforeman/hammer-cli-foreman/pull/641)), [#38611](http://projects.theforeman.org/issues/38611)
+* Remove ovirt ([PR #639](https://github.com/theforeman/hammer-cli-foreman/pull/639)), [#38294](http://projects.theforeman.org/issues/38294)
+* Bump to 3.16.0-develop
+
 ### 3.15.0 (2025-05-14)
 * Use 3.15 test data
 * Fix hammer insights inventory sync error message ([PR #640](https://github.com/theforeman/hammer-cli-foreman/pull/640)), [#38401](http://projects.theforeman.org/issues/38401)

data/lib/hammer_cli_foreman/auth_source_ldap.rb

@@ -30,7 +30,8 @@ module HammerCLIForeman
           field :account, _('Account Username')
           field :base_dn, _('Base DN')
           field :groups_base, _('Groups base DN')
-          field :use_netgroups, _('Use Netgroups'), Fields::Boolean
+          field :use_netgroups, _('Use Netgroups'), Fields::Boolean, :replaced_by => [_('Account'), _('LDAP group membership')].join('/')
+          field :ldap_group_membership, _('LDAP group membership')
           field :ldap_filter, _('LDAP filter')
           field :onthefly_register, _('Automatically Create Accounts?'), Fields::Boolean
           field :usergroup_sync, _('Usergroup sync'), Fields::Boolean

data/lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb

@@ -12,6 +12,5 @@ module HammerCLIForeman
   require 'hammer_cli_foreman/compute_resource/ec2.rb'
   require 'hammer_cli_foreman/compute_resource/libvirt.rb'
   require 'hammer_cli_foreman/compute_resource/openstack.rb'
-  require 'hammer_cli_foreman/compute_resource/ovirt.rb'
   require 'hammer_cli_foreman/compute_resource/vmware.rb'
 end

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -51,21 +51,11 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      option "--public-key-path", "PUBLIC_KEY_PATH", _("Path to a file that contains oVirt public key (For oVirt only)"),
-             :format => HammerCLI::Options::Normalizers::File.new
-
-
       success_message _("Compute resource created.")
       failure_message _("Could not create the compute resource")
 
       build_options
 
-      def request_params
-        params = super
-        params['compute_resource']['public_key'] = option_public_key_path if option_public_key_path
-        params
-      end
-
       validate_options do
         if option(:option_provider).value.nil? || option(:option_name).value.nil?
           all(:option_name, :option_provider).required
@@ -82,17 +72,9 @@ module HammerCLIForeman
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      option "--public-key-path", "PUBLIC_KEY_PATH", _("Path to a file that contains oVirt public key (For oVirt only)"),
-             :format => HammerCLI::Options::Normalizers::File.new
-
       success_message _("Compute resource updated.")
       failure_message _("Could not update the compute resource")
 
-      def request_params
-        params = super
-        params['compute_resource']['public_key'] = option_public_key_path if option_public_key_path
-        params
-      end
       build_options :without => :name
     end
 
@@ -145,19 +127,6 @@ module HammerCLIForeman
       extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
-    class AvailableVnicProfilesCommand < HammerCLIForeman::ListCommand
-      action :available_vnic_profiles
-      command_name 'vnic-profiles'
-
-      output do
-        field :id, _('VNIC profile ID'), Fields::Field, :max_width => 200, :hide_blank => true
-        field :name, _('Name')
-        field :network, _('Network ID')
-      end
-
-      build_options
-    end
-
     class AvailableImagesCommand < HammerCLIForeman::ListCommand
       action :available_images
       command_name 'images'

data/lib/hammer_cli_foreman/filter.rb

@@ -9,8 +9,6 @@ module HammerCLIForeman
         field :id, _("Id")
         field :resource_type, _("Resource type")
         field :search, _("Search")
-        field :unlimited?, _("Unlimited?"), Fields::Boolean
-        field :override?, _("Override?"), Fields::Boolean
         field :role, _("Role"), Fields::Reference
         field :permissions, _("Permissions"), Fields::List
       end
@@ -27,8 +25,15 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition do
-        HammerCLIForeman::References.taxonomies(self)
         HammerCLIForeman::References.timestamps(self)
+        from :role do
+          collection :locations, _("Locations"), numbered: false, hide_blank: true do
+            custom_field Fields::Reference, name_key: :title
+          end
+          collection :organizations, _("Organizations"), numbered: false, hide_blank: true do
+            custom_field Fields::Reference, name_key: :title
+          end
+        end
       end
 
       def extend_data(filter)
@@ -42,81 +47,18 @@ module HammerCLIForeman
     end
 
 
-    module TaxonomyCheck
-
-      def self.included(base)
-        def taxonomy_options?
-          opt_names = ['location_ids', 'organization_ids']
-          opt_names += resolver.searchables(:locations).map { |s| 'location_' + s.plural_name }
-          opt_names += resolver.searchables(:organizations).map { |s| 'organization_' + s.plural_name }
-          opt_names.any? { |opt| send(HammerCLI.option_accessor_name(opt)) }
-        end
-
-        def signal_override_usage_error
-          signal_usage_error _('Organizations and locations can be set only for overriding filters.')
-        end
-
-        base.extend_help do |base_h|
-          base_h.section(_('Overriding organizations and locations')) do |section_h|
-            override_condition = "--override=true"
-            org_opts = '--organization[s|-ids]'
-            loc_opts = '--location[s|-ids]'
-
-            section_h.text(_("Filters inherit organizations and locations from its role by default. This behavior can be changed by setting %{condition}.%{wsp}" +
-              "Therefore options %{org_opts} and %{loc_opts} are applicable only when the override flag is set.") % {
-              :wsp => "\n",
-              :org_opts => org_opts,
-              :loc_opts => loc_opts,
-              :condition => override_condition
-            })
-          end
-        end
-      end
-    end
-
-
     class CreateCommand < HammerCLIForeman::CreateCommand
-      include TaxonomyCheck
-
       success_message _("Permission filter for [%<resource_type_label>s] created.")
       failure_message _("Could not create the permission filter")
 
-      def validate_options
-        signal_override_usage_error if !option_override && taxonomy_options?
-      end
-
       build_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      include TaxonomyCheck
-
       success_message _("Permission filter for [%<resource_type_label>s] updated.")
       failure_message _("Could not update the permission filter")
 
-      def request_params
-        params = super
-        unless override?
-          # Clear taxonomies in case the filter is switching override from true to false
-          params['filter']['location_ids'] = [] if !@filter || !@filter['locations'].empty?
-          params['filter']['organization_ids'] = [] if !@filter || !@filter['organizations'].empty?
-        end
-        params
-      end
-
-      def validate_options
-        signal_override_usage_error if !override? && taxonomy_options?
-      end
-
-      def override?
-        if option_override.nil?
-          filter['override?']
-        else
-          option_override
-        end
-      end
-
       def filter
         @filter ||= HammerCLIForeman.foreman_resource!(:filters).action(:show).call({ :id => get_identifier }, request_headers, request_options)
       end

data/lib/hammer_cli_foreman/report_template.rb

@@ -16,6 +16,7 @@ module HammerCLIForeman
       output ListCommand.output_definition do
         field :description, _('Description'), Fields::Text
         field :locked, _("Locked"), Fields::Boolean
+        field :cloned_from_id, _("Cloned from id"), nil, :hide_blank => true
         field :default, _("Default"), Fields::Boolean
         HammerCLIForeman::References.timestamps(self)
         HammerCLIForeman::References.taxonomies(self)

data/lib/hammer_cli_foreman/template.rb

@@ -42,6 +42,7 @@ module HammerCLIForeman
       output ListCommand.output_definition do
         field :description, _('Description'), Fields::Text
         field :locked, _("Locked"), Fields::Boolean
+        field :cloned_from_id, _("Cloned from id"), nil, :hide_blank => true
         HammerCLIForeman::References.operating_systems(self)
         HammerCLIForeman::References.taxonomies(self)
         collection :template_combinations, 'Template Combinations' do

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "3.15.0"
+    @version ||= Gem::Version.new "3.17.0"
   end
 end

data/test/functional/compute_attribute_test.rb

@@ -48,7 +48,7 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
                                      "vm_attrs" => {}
@@ -59,16 +59,16 @@ describe "parameters" do
           "compute_attribute" =>
             {
               "id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
-              "provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
+              "provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
               "compute_profile_name" => "profile2", "vm_attrs" => {"cores" => "1"}
             }
         }
 
       @compute_resource = {
           "id" => 1,
-          "name" => "ovirt_compute_resource",
-          "provider" => "Ovirt",
-          "provider_friendly_name" => "oVirt",
+          "name" => "libvirt_compute_resource",
+          "provider" => "Libvirt",
+          "provider_friendly_name" => "Libvirt",
       }
     end
 
@@ -129,7 +129,7 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
                                      "vm_attrs" => {}
@@ -137,7 +137,7 @@ describe "parameters" do
         }
       @compute_attribute = {
         "id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
-        "provider_friendly_name" => "oVirt", "compute_profile_id" => 1, "compute_profile_name" => "profile2",
+        "provider_friendly_name" => "Libvirt", "compute_profile_id" => 1, "compute_profile_name" => "profile2",
         "vm_attrs" => {"volumes_attributes" => {"1525004465" => {"size_gb" => "1"}}}
       }
 
@@ -211,7 +211,7 @@ describe "parameters" do
                                        "id" => 2,
                                        "compute_resource_id" => 1,
                                        "compute_resource_name" => "bla",
-                                       "provider_friendly_name" => "oVirt",
+                                       "provider_friendly_name" => "Libvirt",
                                        "compute_profile_id" => 1,
                                        "compute_profile_name" => "profile2",
                                         "vm_attrs" => {}
@@ -283,7 +283,7 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
                                      "vm_attrs" => {"volumes_attributes" => { "1" => {"size_gb"=>"1"}}}
@@ -291,7 +291,7 @@ describe "parameters" do
         }
       @compute_attribute =  {
         "id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
-        "provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
+        "provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
         "compute_profile_name" => "profile2", "vm_attrs" => {"volumes_attributes" => {}}
       }
     end
@@ -362,7 +362,7 @@ describe "parameters" do
                                    "id" => 2,
                                    "compute_resource_id" => 1,
                                    "compute_resource_name" => "bla",
-                                   "provider_friendly_name" => "oVirt",
+                                   "provider_friendly_name" => "Libvirt",
                                    "compute_profile_id" => 1,
                                    "compute_profile_name" => "profile2",
                                    "vm_attrs" => {}
@@ -376,7 +376,7 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
                                      "vm_attrs" => {}
@@ -385,9 +385,9 @@ describe "parameters" do
 
       @compute_resource = {
           "id" => 1,
-          "name" => "ovirt_compute_resource",
-          "provider" => "Ovirt",
-          "provider_friendly_name" => "oVirt",
+          "name" => "libvirt_compute_resource",
+          "provider" => "Libvirt",
+          "provider_friendly_name" => "Libvirt",
       }
 
     end
@@ -491,7 +491,7 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
                                      "vm_attrs" => {}
@@ -500,9 +500,9 @@ describe "parameters" do
 
       @compute_resource = {
           "id" => 1,
-          "name" => "ovirt_compute_resource",
-          "provider" => "Ovirt",
-          "provider_friendly_name" => "oVirt",
+          "name" => "libvirt_compute_resource",
+          "provider" => "Libvirt",
+          "provider_friendly_name" => "Libvirt",
       }
     end
 
@@ -574,23 +574,23 @@ describe "parameters" do
                                      "id" => 2,
                                      "compute_resource_id" => 1,
                                      "compute_resource_name" => "bla",
-                                     "provider_friendly_name" => "oVirt",
+                                     "provider_friendly_name" => "Libvirt",
                                      "compute_profile_id" => 1,
                                      "compute_profile_name" => "profile2",
-                                     "vm_attrs" => {"interfaces_attributes" => { "1" => {"compute_name"=>"eth0"}}}
+                                     "vm_attrs" => {"nics_attributes" => { "1" => {"compute_name"=>"eth0"}}}
                                    }]
         }
       @compute_attribute =  {
         "id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
-        "provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
+        "provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
         "compute_profile_name" => "profile2", "vm_attrs" => {"interfaces_attributes" => {}}
       }
 
       @compute_resource = {
           "id" => 1,
-          "name" => "ovirt_compute_resource",
-          "provider" => "Ovirt",
-          "provider_friendly_name" => "oVirt",
+          "name" => "libvirt_compute_resource",
+          "provider" => "Libvirt",
+          "provider_friendly_name" => "Libvirt",
       }
 
     end

data/test/functional/compute_profile_test.rb

@@ -26,7 +26,7 @@ describe "parameters" do
                                      "id": 2,
                                      "compute_resource_id": 3,
                                      "compute_resource_name": "bla",
-                                     "provider_friendly_name": "oVirt",
+                                     "provider_friendly_name": "Libvirt",
                                      "compute_profile_id": 1,
                                      "compute_profile_name": "profile2",
                                    }]
@@ -64,7 +64,7 @@ describe "parameters" do
                                    "id": 4,
                                    "compute_resource_id": 3,
                                    "compute_resource_name": "bla",
-                                   "provider_friendly_name": "oVirt",
+                                   "provider_friendly_name": "Libvirt",
                                    "compute_profile_id": 3,
                                    "compute_profile_name": "profile3",
                                  }]

data/test/functional/compute_resource_test.rb

@@ -61,7 +61,7 @@ describe 'compute-resource' do
         assert_cmd(expected_result, result)
       end
     end
-   
+
 
     it 'should print error for blank --provider option' do
       params = %w(--provider= --name=new'')
@@ -109,55 +109,6 @@ describe 'compute-resource' do
 
       assert_cmd(success_result("Compute resource created.\n"), result)
     end
-
-    it 'should create a compute-resource ovirt' do
-      params = %w(--name=test-ovirt
-                  --provider=ovirt
-                  --url=https://ovirt.example.com/ovirt-engine/api
-                  --user=foreman
-                  --password=changeme
-                  --datacenter=ovirt.example.com)
-
-      api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
-        (params['compute_resource']['name'] == 'test-ovirt') &&
-          (params['compute_resource']['provider'] == 'ovirt') &&
-          (params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
-          (params['compute_resource']['user'] == 'foreman') &&
-          (params['compute_resource']['password'] == 'changeme') &&
-          (params['compute_resource']['datacenter'] == 'ovirt.example.com')
-      end
-
-      result = run_cmd(@cmd + params)
-
-      assert_cmd(success_result("Compute resource created.\n"), result)
-    end
-
-
-    it 'should create a compute-resource ovirt with custom public key' do
-      tempfile = Tempfile.new('ca.pem')
-      tempfile << 'test data'
-      tempfile.close
-      params = %W(--name=test-ovirt
-                  --provider=ovirt
-                  --url=https://ovirt.example.com/ovirt-engine/api
-                  --user=foreman
-                  --password=changeme
-                  --datacenter=ovirt.example.com
-                  --public-key-path=#{tempfile.path})
-
-      api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
-        (params['compute_resource']['name'] =='test-ovirt') &&
-            (params['compute_resource']['provider'] == 'ovirt') &&
-            (params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
-            (params['compute_resource']['user'] == 'foreman') &&
-            (params['compute_resource']['password'] == 'changeme') &&
-            (params['compute_resource']['datacenter'] == 'ovirt.example.com' &&
-            (params['compute_resource']['public_key'] == 'test data'))
-      end
-      result = run_cmd(@cmd + params)
-
-      assert_cmd(success_result("Compute resource created.\n"), result)
-    end
 end
 
   describe 'clusters' do
@@ -210,31 +161,6 @@ end
     end
   end
 
-  describe 'vnic profiles' do
-    let(:cmd) { base_cmd << 'vnic-profiles' }
-    let(:vnic_profile_1) { { id: 1, name: 'network1', network: 2 } }
-    let(:vnic_profile_2) { { id: 2, name: 'network2', network: 2 } }
-    let(:vnic_profiles) { [vnic_profile_1, vnic_profile_2] }
-
-    it 'lists available vnic profiles for a compute resource' do
-      api_expects(:compute_resources, :available_vnic_profiles, 'vnic-profiles').with_params(
-          'id' => '1'
-      ).returns(index_response(vnic_profiles))
-
-      output = IndexMatcher.new(
-          [
-              ['VNIC PROFILE ID', 'NAME', 'NETWORK ID'],
-              ['1', 'network1','2'],
-              ['2', 'network2','2']
-          ]
-      )
-      expected_result = success_result(output)
-
-      result = run_cmd(cmd + base_params)
-      assert_cmd(expected_result, result)
-    end
-  end
-
   describe 'images' do
     let(:cmd) { base_cmd << 'images' }
     let(:image1) { { uuid: 1, name: 'image1' } }

data/test/functional/filter_test.rb

@@ -4,10 +4,9 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe 'filter' do
   def api_expects_filter_info(options)
-    override = !!options[:override]
     api_expects(:filters, :show, 'Get filter info').with_params(
       id: '1'
-    ).returns(@filter.merge('override?' => override))
+    ).returns(@filter)
   end
 
   def taxonomy_usage_error(action, cmd)
@@ -27,15 +26,6 @@ describe 'filter' do
       @cmd = %w[filter create]
     end
 
-    it 'prints error when taxonomies are used for a not-overriding filter' do
-      params = ['--organization-ids=1,2', '--location-ids=3,4', '--override=false']
-
-      api_expects_no_call
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('create', @cmd), result)
-    end
-
     it 'should create a filter' do
       params = ['--role-id=1', '--permission-ids=[1]']
 
@@ -67,8 +57,8 @@ describe 'filter' do
       api_expects(:filters, :index, 'List filters').returns(@filters)
 
       output = IndexMatcher.new([
-                                  ['ID', 'RESOURCE TYPE', 'SEARCH', 'UNLIMITED?', 'OVERRIDE?', 'ROLE', 'PERMISSIONS'],
-                                  ['1', 'Architecture', 'none', 'yes', 'no', 'Manager', 'view_architectures']
+                                  ['ID', 'RESOURCE TYPE', 'SEARCH', 'ROLE', 'PERMISSIONS'],
+                                  ['1', 'Architecture', 'none', 'Manager', 'view_architectures']
                                 ])
       expected_result = success_result(output)
 
@@ -100,115 +90,4 @@ describe 'filter' do
       assert_cmd(success_result("Permission filter deleted.\n"), result)
     end
   end
-
-  describe 'update' do
-    before do
-      @cmd = %w[filter update]
-      @filter = {
-        'search' => nil,
-        'resource_type_label' => 'User',
-        'resource_type' => 'User',
-        'unlimited?' => false,
-        'created_at' => '2017-07-18 14:34:09 UTC',
-        'updated_at' => '2017-07-18 14:34:09 UTC',
-        'override?' => true,
-        'id' => 404,
-        'role' => {
-          'name' => 'Some Role',
-          'id' => 28,
-          'description' => "Description\nof the new\nrole",
-          'origin' => nil
-        },
-        'permissions' => [{
-          'name' => 'view_users',
-          'id' => 164,
-          'resource_type' => 'User'
-        }],
-        'locations' => [{
-          'id' => 28,
-          'name' => 'location74',
-          'title' => 'location74',
-          'description' => nil
-        }],
-        'organizations' => [{
-          'id' => 27,
-          'name' => 'organization74',
-          'title' => 'organization74',
-          'description' => nil
-        }]
-      }
-    end
-
-    it 'resets taxonomies when a filter is not-overriding' do
-      params = ['--id=1']
-
-      api_expects_filter_info(override: false)
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => [],
-          'location_ids' => []
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'resets taxonomies when switching a filter to not-overriding' do
-      params = ['--id=1', '--override=false']
-
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => [],
-          'location_ids' => []
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'can add taxonomies when a filter is overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4']
-
-      api_expects_filter_info(override: true)
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => %w[1 2],
-          'location_ids' => %w[3 4]
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'can add taxonomies when switching a filter to overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4', '--override=true']
-
-      api_expects(:filters, :update, 'Update the filter').with_params(
-        'filter' => {
-          'organization_ids' => %w[1 2],
-          'location_ids' => %w[3 4]
-        }
-      ).returns(@filter)
-
-      assert_update_success(run_cmd(@cmd + params))
-    end
-
-    it 'prints error when taxonomies are used on not-overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4']
-
-      api_expects_filter_info(override: false)
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('update', @cmd), result)
-    end
-
-    it 'prints error when taxonomies are used when switching a filter to not-overriding' do
-      params = ['--id=1', '--organization-ids=1,2', '--location-ids=3,4', '--override=false']
-
-      api_expects_no_call
-
-      result = run_cmd(@cmd + params)
-      assert_cmd(taxonomy_usage_error('update', @cmd), result)
-    end
-  end
 end

data/test/functional/virtual_machine_test.rb

@@ -11,10 +11,7 @@ describe HammerCLIForeman::VirtualMachine do
       @vm = {
           'id' => 1,
           'name' => 'vm1',
-          'provider' => 'Ovirt',
-          'cpu' => 1,
-          'memory' => 1,
-          'status' => 'down'
+          'provider' => 'Libvirt',
       }
     end
 
@@ -38,7 +35,7 @@ describe HammerCLIForeman::VirtualMachine do
         par['id'] == '1' && par['vm_id'] == '1'
       end.returns(@vm)
       result = run_cmd(@cmd + params)
-      assert_match("Id:     1\nName:   vm1\nCPUs:   1\nMemory: 1\nStatus: down\n\n", result.out)
+      assert_match("Id:   1\nName: vm1\n\n", result.out)
     end
 
   end

data/test/unit/filter_test.rb

@@ -60,11 +60,6 @@ describe HammerCLIForeman::Filter do
   describe "CreateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::CreateCommand.new("", ctx) }
 
-    before do
-      # FIXME: remove stubbing option_override once tests are switched to apidoc 1.14+
-      cmd.stubs(:option_override).returns(false)
-    end
-
     describe "parameters" do
       it_should_accept "role id and permission ids", ["--role-id=1", "--permission-ids=1,2"]
       it_should_accept "role name and permission ids", ["--role=role", "--permission-ids=1,2"]
@@ -85,11 +80,6 @@ describe HammerCLIForeman::Filter do
   describe "UpdateCommand" do
     let(:cmd) { HammerCLIForeman::Filter::UpdateCommand.new("", ctx) }
 
-    before do
-      # FIXME: remove stubbing option_override once tests are switched to apidoc 1.14+
-      cmd.stubs(:option_override).returns(false)
-    end
-
     describe "parameters" do
       it_should_accept "id, role id and permission ids", ["--id=1", "--role-id=1", "--permission-ids=1,2"]
       it_should_accept "id, role name and permission ids", ["--id=1", "--role=role", "--permission-ids=1,2"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -148,7 +148,6 @@ files:
 - lib/hammer_cli_foreman/compute_resource/ec2.rb
 - lib/hammer_cli_foreman/compute_resource/libvirt.rb
 - lib/hammer_cli_foreman/compute_resource/openstack.rb
-- lib/hammer_cli_foreman/compute_resource/ovirt.rb
 - lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb
 - lib/hammer_cli_foreman/compute_resource/utils.rb
 - lib/hammer_cli_foreman/compute_resource/vmware.rb

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -1,70 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    class Ovirt < Base
-      def name
-        'oVirt'
-      end
-
-      def compute_attributes
-        [
-          ['cluster',         _('ID or name of cluster to use')],
-          ['template',        _('Hardware profile to use')],
-          ['cores',           _('Integer value, number of cores')],
-          ['sockets',         _('Integer value, number of sockets')],
-          ['memory',          _('Amount of memory, integer value in bytes')],
-          ['ha',              _('Boolean, set 1 to high availability')],
-          ['display_type',    _('Possible values: %s') % 'VNC, SPICE'],
-          ['keyboard_layout', _('Possible values: %s. Not usable if display type is SPICE.') % 'ar, de-ch, es, fo, fr-ca, hu, ja, mk, no, pt-br, sv, da, en-gb, et, fr, fr-ch, is, lt, nl, pl, ru, th, de, en-us, fi, fr-be, hr, it, lv, nl-be, pt, sl, tr']
-        ]
-      end
-
-      def host_attributes
-        [
-          ['start', _('Boolean, set 1 to start the vm')]
-        ]
-      end
-
-      def interface_attributes
-        [
-          ['compute_name',      _('Compute name, e.g. eth0')],
-          ['compute_network',   _('Select one of available networks for a cluster, must be an ID or a name')],
-          ['compute_interface', _('Interface type')],
-          ['compute_vnic_profile', _('Vnic Profile')]
-        ]
-      end
-
-      def volume_attributes
-        [
-          ['size_gb',        _('Volume size in GB, integer value')],
-          ['storage_domain', _('ID or name of storage domain')],
-          ['bootable',       _('Boolean, set 1 for bootable, only one volume can be bootable')],
-          ['preallocate',    _('Boolean, set 1 to preallocate')],
-          ['wipe_after_delete', _('Boolean, set 1 to wipe disk after delete')],
-          ['interface', _('Disk interface name, must be ide, virtio or virtio_scsi')]
-        ]
-      end
-
-      def provider_specific_fields
-        super + [
-          Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter])
-        ]
-      end
-
-      def provider_vm_specific_fields
-        [
-          Fields::Field.new(:label => _('CPUs'), :path => [:cpu]),
-          Fields::Field.new(:label => _('Memory'), :path => [:memory]),
-          Fields::Field.new(:label => _('Status'), :path => [:status]),
-          Fields::Field.new(:label => _('Cores'), :path => [:cores]),
-          Fields::Field.new(:label => _('Type'), :path => [:type])
-        ]
-      end
-
-      def mandatory_resource_options
-        super + %i[url user password datacenter]
-      end
-    end
-
-    HammerCLIForeman.register_compute_resource('ovirt', Ovirt.new)
-  end
-end