hammer_cli_foreman 3.3.0 → 3.5.0

data/test/functional/compute_resource_test.rb

@@ -355,10 +355,31 @@ end
         ]
       )
       expected_result = success_result(output)
+      expected_result.expected_err = "Warning: Option --cluster-id is deprecated. Use --cluster-name instead\n"
 
       result = run_cmd(cmd + params)
       assert_cmd(expected_result, result)
     end
+
+    it 'lists available resource_pools for a compute resource with updated cluster_name param' do
+      api_expects(:compute_resources, :available_resource_pools, 'resource-pools').with_params(
+        'id' => '1', 'cluster_id' => 'test%2Ftest1'
+      ).returns(index_response(resource_pools))
+
+      cluster_param = base_params + ['--cluster-name=test/test1']
+
+      output = IndexMatcher.new(
+        [
+          %w[ID NAME],
+          %w[1 resource_pool1],
+          %w[2 resource_pool2]
+        ]
+      )
+      expected_result = success_result(output)
+
+      result = run_cmd(cmd + cluster_param)
+      assert_cmd(expected_result, result)
+    end
   end
 
   describe 'storage_domains' do

data/test/functional/table_preference_test.rb

@@ -0,0 +1,100 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe 'table_preference' do
+  let(:base_cmd) { ['user', 'table-preference'] }
+  let(:user) do
+    {
+      :id => 1,
+      :name => 'admin'
+    }
+  end
+  let(:table_preference) do
+    {
+      :id => 1,
+      :user_id => user[:id],
+      :name => 'Table Preference',
+      :columns => ['A', 'B', 'C']
+    }
+  end
+
+  describe 'list' do
+    let(:cmd) { base_cmd << 'list' }
+
+    it 'lists table preferences for a given user' do
+      params = ['--user-id', user[:id]]
+      api_expects(:table_preferences, :index, params)
+        .returns(index_response([table_preference]))
+
+      expected_result = success_result(/#{table_preference[:name]}/)
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'create' do
+    let(:cmd) { base_cmd << 'create' }
+
+    it 'creates a table preference for a given table' do
+      params = ['--user-id', user[:id],
+                '--name', table_preference[:name],
+                '--columns', table_preference[:columns]]
+      api_expects(:table_preferences, :create, params)
+        .returns(table_preference)
+
+      expected_result = success_result("Table preference created.\n")
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'update' do
+    let(:cmd) { base_cmd << 'update' }
+
+    it 'updates a table preference for a given table' do
+      params = ['--user-id', user[:id],
+                '--name', table_preference[:name],
+                '--columns', ['A','B','C','D','E']]
+      api_expects(:table_preferences, :update, params)
+        .returns(table_preference)
+
+      expected_result = success_result("Table preference updated.\n")
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'info' do
+    let(:cmd) { base_cmd << 'info' }
+
+    it 'shows table preference details of a given table' do
+      params = ['--user-id', user[:id],
+                '--name', table_preference[:name]]
+      api_expects(:table_preferences, :show, params)
+        .returns(table_preference)
+
+      expected_result = success_result(/#{table_preference[:name]} | #{table_preference[:columns]}/)
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'delete' do
+    let(:cmd) { base_cmd << 'delete' }
+
+    it 'deletes a table preference for a given table' do
+      params = ['--user-id', user[:id],
+                '--name', table_preference[:name]]
+      api_expects(:table_preferences, :destroy, params)
+        .returns({})
+
+      expected_result = success_result("Table preference deleted.\n")
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require "mocha/minitest"
 require 'hammer_cli'
 require 'hammer_cli_foreman/testing/api_expectations'
 
-FOREMAN_VERSION = ENV['TEST_API_VERSION'] || '3.1'
+FOREMAN_VERSION = ENV['TEST_API_VERSION'] || '3.4'
 unless Dir.entries('test/data').include? FOREMAN_VERSION
   raise StandardError.new "Version is not correct"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -84,10 +84,10 @@ extra_rdoc_files:
 - doc/option_builder.md
 - doc/using_hammer_cli_foreman_command.md
 - doc/developer_docs.md
-- doc/host_create.md
 - doc/plugin.md
 - doc/testing.md
 - doc/configuration.md
+- doc/host_create.md
 - doc/release_notes.md
 - README.md
 files:
@@ -124,6 +124,7 @@ files:
 - lib/hammer_cli_foreman/bookmark.rb
 - lib/hammer_cli_foreman/combination.rb
 - lib/hammer_cli_foreman/command_extensions.rb
+- lib/hammer_cli_foreman/command_extensions/compute_resource_subcommand.rb
 - lib/hammer_cli_foreman/command_extensions/domain.rb
 - lib/hammer_cli_foreman/command_extensions/fields.rb
 - lib/hammer_cli_foreman/command_extensions/hosts.rb
@@ -143,7 +144,6 @@ files:
 - lib/hammer_cli_foreman/compute_resource.rb
 - lib/hammer_cli_foreman/compute_resource/base.rb
 - lib/hammer_cli_foreman/compute_resource/ec2.rb
-- lib/hammer_cli_foreman/compute_resource/gce.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
@@ -205,6 +205,7 @@ files:
 - lib/hammer_cli_foreman/ssh_keys.rb
 - lib/hammer_cli_foreman/status.rb
 - lib/hammer_cli_foreman/subnet.rb
+- lib/hammer_cli_foreman/table_preference.rb
 - lib/hammer_cli_foreman/task_helper.rb
 - lib/hammer_cli_foreman/template.rb
 - lib/hammer_cli_foreman/testing/api_expectations.rb
@@ -245,6 +246,7 @@ files:
 - test/data/2.4/foreman_api.json
 - test/data/2.5/foreman_api.json
 - test/data/3.1/foreman_api.json
+- test/data/3.4/foreman_api.json
 - test/data/README.md
 - test/functional/architecture_test.rb
 - test/functional/associating_commands_test.rb
@@ -280,6 +282,7 @@ files:
 - test/functional/status_test.rb
 - test/functional/subnet/create_test.rb
 - test/functional/subnet/update_test.rb
+- test/functional/table_preference_test.rb
 - test/functional/template_test.rb
 - test/functional/test_helper.rb
 - test/functional/user_mail_notification_test.rb
@@ -385,6 +388,7 @@ test_files:
 - test/data/2.4/foreman_api.json
 - test/data/2.5/foreman_api.json
 - test/data/3.1/foreman_api.json
+- test/data/3.4/foreman_api.json
 - test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
 - test/functional/hostgroup/create_test.rb
@@ -405,12 +409,12 @@ test_files:
 - test/functional/settings_test.rb
 - test/functional/status_test.rb
 - test/functional/user_mail_notification_test.rb
+- test/functional/compute_resource_test.rb
 - test/functional/compute_profile_test.rb
 - test/functional/realm_test.rb
 - test/functional/usergroup_test.rb
 - test/functional/organization_test.rb
 - test/functional/virtual_machine_test.rb
-- test/functional/compute_resource_test.rb
 - test/functional/domain/create_test.rb
 - test/functional/domain/update_test.rb
 - test/functional/filter_test.rb
@@ -425,6 +429,7 @@ test_files:
 - test/functional/bookmark_test.rb
 - test/functional/model_test.rb
 - test/functional/registration_test.rb
+- test/functional/table_preference_test.rb
 - test/unit/api/void_auth_test.rb
 - test/unit/api/interactive_basic_auth_test.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb

data/lib/hammer_cli_foreman/compute_resource/gce.rb

@@ -1,47 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    class GCE < Base
-      def name
-        'GCE'
-      end
-
-      def compute_attributes
-        %w[machine_type network associate_external_ip]
-      end
-
-      def interfaces_attrs_name
-        'network_interfaces_nics_attributes'
-      end
-
-      def volume_attributes
-        [
-          ['size_gb', _('Volume size in GB, integer value')]
-        ]
-      end
-
-      def provider_specific_fields
-        [
-          Fields::Field.new(:label => _('Project'), :path => [:project]),
-          Fields::Field.new(:label => _('Email'), :path => [:email]),
-          Fields::Field.new(:label => _('Key Path'), :path => [:key_path]),
-          Fields::Field.new(:label => _('Zone'), :path => [:zone])
-        ]
-      end
-
-      def provider_vm_specific_fields
-        [
-          Fields::Field.new(:label => _('Machine Type'), :path => [:machine_type]),
-          Fields::Field.new(:label => _('Status'), :path => [:status]),
-          Fields::Field.new(:label => _('Description'), :path => [:description]),
-          Fields::Field.new(:label => _('Zone'), :path => [:zone])
-        ]
-      end
-
-      def mandatory_resource_options
-        super + %I{project key_path zone}
-      end
-    end
-
-    HammerCLIForeman.register_compute_resource('gce', GCE.new)
-  end
-end