hammer_cli_foreman 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4787fbc9dbda1fcd2311672da8001300715cfc1448b82f985509a73cab3ab416
-  data.tar.gz: a2ee1f1044f4422181109b166040b8e83dd9c727310c7753e89d26c23dae3c7a
+  metadata.gz: 006d4b4eed7a0555a9094223fcbf0310fbf45787fa879f96426b7420a3fd8207
+  data.tar.gz: 78bb6049eae38f6793a420461c5ee8772eac699d538e33d331d01f12ab236178
 SHA512:
-  metadata.gz: d1fe6bb98a5c352f95ce509e7e56f7c398180aa3790d1105f2c7ffb98d8dcfca4e4ab1cda4331a1f70000a834a75671782ed8e1d6b7ba65b3d83b474f8a9f3c6
-  data.tar.gz: 8e490092a17af3fd13d8c8c5d6ff6f42227e3e9bfa888818975308679a0724e6f6e8183d811a3a47dcbd369da0e0f92ccf4b2131b4e90d9b0d17bda9c01950fc
+  metadata.gz: 1a66faf43bc97309b2e98ddbf9aeb9dc9f5bd6a768326d305692819ac4c76bcb4d9def107795823b5df9192993f691ea608a31c9af003c0fcad4cbb57e8c09a1
+  data.tar.gz: a873297a23beb5e95f8bd1a232e836a5b914af82836f90e33722ab8a7162f55396c17c93955d50929bbed95b3fe7c1b0cc48907b918c465a247d7ab22d511b90

data/doc/release_notes.md

@@ -1,5 +1,11 @@
 Release notes
 =============
+### 3.5.0 (2022-10-31)
+* Extract gce related info ([PR #606](https://github.com/theforeman/hammer-cli-foreman/pull/606)), [#35659](http://projects.theforeman.org/issues/35659)
+* Change auth endpoint for negotiation, [#35473](http://projects.theforeman.org/issues/35473)
+* Enhance vmware listing commands and switch to cluster_name param ([PR #604](https://github.com/theforeman/hammer-cli-foreman/pull/604)), [#35438](http://projects.theforeman.org/issues/35438)
+* Bump to 3.5.0-develop
+
 ### 3.4.0 (2022-08-09)
 * Add options for table preferences cli ([PR #603](https://github.com/theforeman/hammer-cli-foreman/pull/603)), [#35219](http://projects.theforeman.org/issues/35219)
 * I18n - extracting new, pulling from tx, [#34629](http://projects.theforeman.org/issues/34629)

data/lib/hammer_cli_foreman/api/negotiate_auth.rb

@@ -2,7 +2,7 @@ module HammerCLIForeman
   module Api
     class NegotiateAuth < ApipieBindings::Authenticators::Negotiate
       def initialize(foreman_url, **options)
-        super("#{foreman_url}/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url).merge(options))
+        super("#{foreman_url}/api/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url).merge(options))
       end
 
       def user

data/lib/hammer_cli_foreman/command_extensions/compute_resource_subcommand.rb

@@ -0,0 +1,14 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class ComputeResourceSubcommand < HammerCLI::CommandExtensions
+      option '--cluster-id', 'ID', _('Cluster ID'),
+             deprecated: _('Use --cluster-name instead')
+      option '--cluster-name', 'NAME', _('Cluster name or path to search by'),
+             attribute_name: :option_cluster_id
+
+      request_params do |params|
+        params['cluster_id'] = params['cluster_id'].gsub('/', '%2F') if params['cluster_id']
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -7,3 +7,4 @@ require 'hammer_cli_foreman/command_extensions/status'
 require 'hammer_cli_foreman/command_extensions/user'
 require 'hammer_cli_foreman/command_extensions/subnet'
 require 'hammer_cli_foreman/command_extensions/domain'
+require 'hammer_cli_foreman/command_extensions/compute_resource_subcommand'

data/lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb

@@ -10,7 +10,6 @@ module HammerCLIForeman
 
   require 'hammer_cli_foreman/compute_resource/base'
   require 'hammer_cli_foreman/compute_resource/ec2.rb'
-  require 'hammer_cli_foreman/compute_resource/gce.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'

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -64,7 +64,9 @@ module HammerCLIForeman
       def provider_specific_fields
         super + [
           Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
-          Fields::Field.new(:label => _('Server'), :path => [:server])
+          Fields::Field.new(:label => _('Server'), :path => [:server]),
+          Fields::Boolean.new(:label => _('Console password set'), :path => [:set_console_password]),
+          Fields::Boolean.new(:label => _('Caching enabled'), :path => [:caching_enabled])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -121,6 +121,9 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
+        field :num_host, _('Hosts')
+        field :full_path, _('Cluster path')
       end
 
       build_options
@@ -133,9 +136,13 @@ module HammerCLIForeman
       output do
         field :id, _('Id'), Fields::Field, :max_width => 200, :hide_blank => true
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
+        field :virtualswitch, _('Virtual switch')
+        field :vlanid, _('VLAN ID')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableVnicProfilesCommand < HammerCLIForeman::ListCommand
@@ -158,6 +165,7 @@ module HammerCLIForeman
       output do
         field :uuid, _('Uuid')
         field :name, _('Name')
+        field :path, _('Path'), Fields::Field, :hide_blank => true
       end
 
       build_options
@@ -182,6 +190,10 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :parent, _('Parent')
+        field :datacenter, _('Datacenter')
+        field :path, _('Path'), Fields::Field, :max_width => 50
+        field :type, _('Type')
       end
 
       build_options
@@ -206,9 +218,12 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :cluster, _('Cluster')
+        field :datacenter, _('Datacenter')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableStorageDomainsCommand < HammerCLIForeman::ListCommand
@@ -220,7 +235,8 @@ module HammerCLIForeman
         field :name, _('Name')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableStoragePodsCommand < HammerCLIForeman::ListCommand
@@ -230,9 +246,11 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableSecurityGroupsCommand < HammerCLIForeman::ListCommand
@@ -252,8 +270,10 @@ module HammerCLIForeman
       command_name 'virtual-machines'
 
       output do
-        field :id, _("Id")
-        field :name, _("Name")
+        field :id, _('Id')
+        field :name, _('Name')
+        field :path, _('Path'), Fields::Field, :max_width => 50
+        field :state, _('State')
       end
 
       build_options

data/lib/hammer_cli_foreman/version.rb

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

data/lib/hammer_cli_foreman/virtual_machine.rb

@@ -9,7 +9,6 @@ module HammerCLIForeman
     class PowerVmCommand < HammerCLIForeman::Command
       action :power_vm
       command_name 'power'
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
 
       success_message _("Virtual machine is powering.")
       failure_message _("Could not power the virtual machine")
@@ -19,7 +18,6 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       action :show_vm
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
 
       output do
         field :id, _("Id")
@@ -39,8 +37,6 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       action :destroy_vm
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
-
 
       success_message _("Virtual machine deleted.")
       failure_message _("Could not delete the virtual machine")

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 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
@@ -409,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

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