hammer_cli_foreman 0.17.2 → 0.18.0

data/lib/hammer_cli_foreman/compute_resource/rackspace.rb

@@ -2,21 +2,24 @@ module HammerCLIForeman
   module ComputeResources
     class Rackspace < Base
       def name
-        _('Rackspace')
+        'Rackspace'
       end
 
       def compute_attributes
+        %w[flavor_id image_id]
+      end
+
+      def provider_specific_fields
         [
-            'flavor_id',
-            'image_id'
+          Fields::Field.new(:label => _('Region'), :path => [:region])
         ]
       end
 
       def mandatory_resource_options
-        super + [:url]
+        super + %i[url]
       end
-
     end
+
     HammerCLIForeman.register_compute_resource('rackspace', Rackspace.new)
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb

@@ -8,7 +8,6 @@ module HammerCLIForeman
     @compute_resources[name] = compute_resource
   end
 
-
   require 'hammer_cli_foreman/compute_resource/base'
   require 'hammer_cli_foreman/compute_resource/ec2.rb'
   require 'hammer_cli_foreman/compute_resource/gce.rb'
@@ -17,4 +16,4 @@ module HammerCLIForeman
   require 'hammer_cli_foreman/compute_resource/ovirt.rb'
   require 'hammer_cli_foreman/compute_resource/rackspace.rb'
   require 'hammer_cli_foreman/compute_resource/vmware.rb'
-end
+end

data/lib/hammer_cli_foreman/compute_resource/utils.rb

@@ -0,0 +1,27 @@
+module HammerCLIForeman
+  module ComputeResources
+    def self.get_image_uuid(compute_resource_id, image_id)
+      HammerCLIForeman.record_to_common_format(
+        HammerCLIForeman.foreman_resource(:images).call(
+          :show, 'compute_resource_id' => compute_resource_id, 'id' => image_id
+        )['uuid']
+      )
+    end
+
+    def self.get_host_compute_resource_id(host_id)
+      HammerCLIForeman.record_to_common_format(
+        HammerCLIForeman.foreman_resource(:hosts).call(
+          :show, 'id' => host_id
+        )['compute_resource_id']
+      )
+    end
+
+    def self.resource_provider(compute_resource_id)
+      HammerCLIForeman.record_to_common_format(
+        HammerCLIForeman.foreman_resource(:compute_resources).call(
+          :show, 'id' => compute_resource_id
+        )
+      )['provider'].downcase
+    end
+  end
+end

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -1,68 +1,77 @@
 module HammerCLIForeman
   module ComputeResources
     class VMware < Base
-      INTERFACE_TYPES = %w(
-           VirtualVmxnet3,
-           VirtualE1000
-         )
+      INTERFACE_TYPES = %w[VirtualVmxnet3 VirtualE1000]
 
       def name
-        _('VMware')
+        'VMware'
       end
 
       def compute_attributes
         [
-            ['cpus',                 _('CPU count')],
-            ['corespersocket',       _('Number of cores per socket (applicable to hardware versions < 10 only)')],
-            ['memory_mb',            _('Integer number, amount of memory in MB')],
-            ['firmware',             'automatic/bios/efi'],
-            ['cluster',              _('Cluster ID from VMware')],
-            ['resource_pool',        _('Resource Pool ID from VMware')],
-            ['path',                 _('Path to folder')],
-            ['guest_id',             _('Guest OS ID form VMware')],
-            ['scsi_controller_type', _('ID of the controller from VMware')],
-            ['hardware_version',     _('Hardware version ID from VMware')],
-            ['add_cdrom',            _('Must be a 1 or 0, Add a CD-ROM drive to the virtual machine')],
-            ['cpuHotAddEnabled',     _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
-            ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add CPU resources while the machine is on')],
-            ['annotation',           _("Annotation Notes")]
+          ['cpus',                 _('CPU count')],
+          ['corespersocket',       _('Number of cores per socket (applicable to hardware versions < 10 only)')],
+          ['memory_mb',            _('Integer number, amount of memory in MB')],
+          ['firmware',             'automatic/bios/efi'],
+          ['cluster',              _('Cluster ID from VMware')],
+          ['resource_pool',        _('Resource Pool ID from VMware')],
+          ['path',                 _('Path to folder')],
+          ['guest_id',             _('Guest OS ID form VMware')],
+          ['hardware_version',     _('Hardware version ID from VMware')],
+          ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add CPU resources while the machine is on')],
+          ['cpuHotAddEnabled',     _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
+          ['add_cdrom',            _('Must be a 1 or 0, Add a CD-ROM drive to the virtual machine')],
+          ['annotation',           _('Annotation Notes')],
+          ['scsi_controllers',     [_('List with SCSI controllers definitions'),
+                                    '  type - ' + _('ID of the controller from VMware'),
+                                    '  key  - ' + _('Key of the controller (e.g. 1000)')
+                                    ].flatten(1).join("\n")]
         ]
       end
 
       def host_attributes
         [
-            ['start',                _("Must be a 1 or 0, whether to start the machine or not")],
+          ['start', _('Must be a 1 or 0, whether to start the machine or not')]
+        ]
+      end
+
+      def volume_attributes
+        [
+          ['name'],
+          ['storage_pod',    _('Storage Pod ID from VMware')],
+          ['datastore',      _('Datastore ID from VMware')],
+          ['mode',           'persistent/independent_persistent/independent_nonpersistent'],
+          ['size_gb',        _('Integer number, volume size in GB')],
+          ['thin',           'true/false'],
+          ['eager_zero',     'true/false'],
+          ['controller_key', 'Associated SCSI controller key']
         ]
       end
 
       def interface_attributes
         [
-            ['compute_type', [
-                _('Type of the network adapter, for example one of:'),
-                INTERFACE_TYPES.map { |it| '  ' + it },
-                _('See documentation center for your version of vSphere to find more details about available adapter types:'),
-                '  https://www.vmware.com/support/pubs/'].flatten(1).join("\n") ] ,
-            ['compute_network', _('Network ID from VMware')]
+          ['compute_type', [
+            _('Type of the network adapter, for example one of:'),
+            INTERFACE_TYPES.map { |it| '  ' + it },
+            _('See documentation center for your version of vSphere to find more details about available adapter types:'),
+            '  https://www.vmware.com/support/pubs/'
+          ].flatten(1).join("\n")],
+          ['compute_network', _('Network ID from VMware')]
         ]
       end
 
-      def volume_attributes;
+      def provider_specific_fields
         [
-            ['name'],
-            ['storage_pod', _('Storage Pod ID from VMware')],
-            ['datastore',   _('Datastore ID from VMware')],
-            ['size_gb',     _('Integer number, volume size in GB')],
-            ['thin',        'true/false'],
-            ['eager_zero',  'true/false'],
-            ['mode',        'persistent/independent_persistent/independent_nonpersistent']
+          Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
+          Fields::Field.new(:label => _('Server'), :path => [:server])
         ]
       end
 
       def mandatory_resource_options
-          super + [:user, :password, :datacenter, :server]
-
+        super + %i[user password datacenter server]
       end
     end
+
     HammerCLIForeman.register_compute_resource('vmware', VMware.new)
   end
-end
+end

data/lib/hammer_cli_foreman/host.rb

@@ -5,10 +5,8 @@ require 'hammer_cli_foreman/smart_class_parameter'
 require 'hammer_cli_foreman/smart_variable'
 require 'hammer_cli_foreman/interface'
 require 'hammer_cli_foreman/hosts/common_update_options'
-require 'hammer_cli_foreman/hosts/common_update_help'
 require 'hammer_cli_foreman/compute_resource/register_compute_resources'
-require 'hammer_cli_foreman/compute_resource/help_utils'
-
+require 'hammer_cli_foreman/compute_resource/utils'
 require 'highline/import'
 
 module HammerCLIForeman
@@ -28,6 +26,9 @@ module HammerCLIForeman
         field :ip, _("IP")
         field :mac, _("MAC")
         field :global_status_label, _("Global Status")
+        field nil, _("Organization"), Fields::SingleReference, :key => :organization, :hide_blank => true, :sets => ['ALL']
+        field nil, _("Location"), Fields::SingleReference, :key => :location, :hide_blank => true, :sets => ['ALL']
+        field :comment, _("Additional Information"), nil, :sets => ['ALL']
       end
 
       build_options :without => [:include]
@@ -284,12 +285,11 @@ module HammerCLIForeman
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
+      include HammerCLIForeman::Hosts::CommonUpdateOptions
+
       success_message _("Host created.")
       failure_message _("Could not create the host")
 
-      include HammerCLIForeman::Hosts::CommonUpdateOptions
-      include HammerCLIForeman::Hosts::CommonUpdateHelp
-
       def validate_options
         super
         unless validator.any(:option_hostgroup_id, :option_hostgroup_name, :option_hostgroup_title).exist?
@@ -303,16 +303,39 @@ module HammerCLIForeman
       end
 
       extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::Interfaces.new)
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(add_host_specific_attrs: true).new)
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("Host updated.")
       failure_message _("Could not update the host")
 
+      def self.create_option_builder
+        builder = super
+        %i[locations organizations].each do |resource_name|
+          builder.builders << UpdateDependentSearchablesOptionBuilder.new(
+            HammerCLIForeman.foreman_resource(resource_name), searchables
+          )
+        end
+        builder
+      end
+
       include HammerCLIForeman::Hosts::CommonUpdateOptions
-      include HammerCLIForeman::Hosts::CommonUpdateHelp
+
+      def option_sources
+        sources = super
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'SelfParam',
+          HammerCLIForeman::OptionSources::NewParams.new(self)
+        )
+        sources
+      end
 
       extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::Interfaces.new)
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(add_host_specific_attrs: true).new)
     end
 
 

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -52,7 +52,6 @@ module HammerCLIForeman
 
       def request_params
         params = super
-
         owner_id = get_resource_id(HammerCLIForeman.foreman_resource(:users), :required => false, :scoped => true)
         params['host']['owner_id'] ||= owner_id unless owner_id.nil?
 
@@ -78,11 +77,27 @@ module HammerCLIForeman
         if action == :update
           params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(option_volume_list) unless option_volume_list.empty?
           params['host']['interfaces_attributes'] = interfaces_attributes unless option_interface_list.empty?
+          if options['option_new_location_id']
+            params['host']['location_id'] = options['option_new_location_id']
+          else
+            params['host'].delete('location_id')
+          end
+          if options['option_new_organization_id']
+            params['host']['organization_id'] = options['option_new_organization_id']
+          else
+            params['host'].delete('organization_id')
+          end
         else
           params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(option_volume_list)
           params['host']['interfaces_attributes'] = interfaces_attributes
         end
 
+        if options["option_image_id"]
+          compute_resource_id = params['host']['compute_resource_id'] || ::HammerCLIForeman::ComputeResources.get_host_compute_resource_id(params['id'])
+          raise ArgumentError, "Missing argument for 'compute_resource'" if compute_resource_id.nil?
+          image_uuid =  ::HammerCLIForeman::ComputeResources.get_image_uuid(compute_resource_id, options["option_image_id"])
+          params['host']['compute_attributes']['image_id'] = image_uuid
+        end
         params['host']['root_pass'] = option_root_password unless option_root_password.nil?
 
         if option_ask_root_password

data/lib/hammer_cli_foreman/image.rb

@@ -31,6 +31,7 @@ module HammerCLIForeman
         field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
         field :username, _("Username")
         field :uuid, _("UUID")
+        field :user_data,  _("User Data")
       end
 
     end

data/lib/hammer_cli_foreman/option_builders.rb

@@ -245,7 +245,53 @@ module HammerCLIForeman
 
   end
 
+  class UpdateDependentSearchablesOptionBuilder < DependentSearchablesOptionBuilder
+    protected
+
+    def dependent_options(resource, resource_name_map)
+      options = []
+      searchables = @searchables.for(resource)
+      resource_name = resource.singular_name
+      aliased_name = aliased(resource_name, resource_name_map)
 
+      unless searchables.empty?
+        first = searchables[0]
+        remaining = searchables[1..-1] || []
+
+        # First option is named by the resource
+        # Eg. --new-organization with accessor option_new_organization_name
+        options << option(
+          optionamize("--new-#{aliased_name}"),
+          "new_#{aliased_name}_#{first.name}".upcase,
+          first.description || ' ',
+          attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{first.name}"),
+          referenced_resource: resource.singular_name
+        )
+
+        # Other options are named by the resource plus the searchable name
+        # Eg. --new-organization-label with accessor option_new_organization_label
+        remaining.each do |s|
+          options << option(
+            optionamize("--new-#{aliased_name}-#{s.name}"),
+            "new_#{aliased_name}_#{s.name}".upcase,
+            s.description || ' ',
+            attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{s.name}"),
+            referenced_resource: resource.singular_name
+          )
+        end
+      end
+
+      options << option(
+        optionamize("--new-#{aliased_name}-id"),
+        "new_#{aliased_name}_id".upcase,
+        description('id', :show),
+        attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_id"),
+        format: HammerCLI::Options::Normalizers::Number.new,
+        referenced_resource: resource.singular_name
+      )
+      options
+    end
+  end
 
   class DependentSearchablesArrayOptionBuilder < DependentSearchablesOptionBuilder
 

data/lib/hammer_cli_foreman/option_sources.rb

@@ -2,4 +2,6 @@ require 'hammer_cli_foreman/option_sources/id_params'
 require 'hammer_cli_foreman/option_sources/ids_params'
 require 'hammer_cli_foreman/option_sources/self_param'
 require 'hammer_cli_foreman/option_sources/user_params'
+require 'hammer_cli_foreman/option_sources/fields_params'
 require 'hammer_cli_foreman/option_sources/puppet_environment_params'
+require 'hammer_cli_foreman/option_sources/new_params'

data/lib/hammer_cli_foreman/option_sources/fields_params.rb

@@ -0,0 +1,20 @@
+module HammerCLIForeman
+  module OptionSources
+    class FieldsParams < HammerCLI::Options::Sources::Base
+      def initialize(command)
+        @command = command
+      end
+
+      def process(defined_options, result)
+        get_options(defined_options, result)
+      end
+
+      def get_options(_defined_options, result)
+        if @command.respond_to?(:option_fields) && @command.option_fields == ['THIN']
+          result[HammerCLI.option_accessor_name('thin')] = true
+        end
+        result
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/option_sources/new_params.rb

@@ -0,0 +1,26 @@
+module HammerCLIForeman
+  module OptionSources
+    class NewParams < HammerCLI::Options::Sources::Base
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(_defined_options, result)
+        resource_names = @command.class.option_builder.builders
+                                 .select { |b| b.class == HammerCLIForeman::UpdateDependentSearchablesOptionBuilder }
+                                 .collect(&:resource)
+                                 .collect(&:singular_name)
+        new_result = resource_names.each_with_object({}) do |name, results|
+          new_name = @command.send("option_new_#{name}_name") || @command.send("option_new_#{name}_title")
+          results["option_new_#{name}_id"] =
+            if new_name
+              @command.resolver.send("#{name}_id", 'option_name' => new_name)
+            else
+              @command.send("option_new_#{name}_id")
+            end
+        end
+        result.merge!(new_result)
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/report_template.rb

@@ -77,7 +77,7 @@ module HammerCLIForeman
       build_options
     end
 
-    class ScheduleCommand < HammerCLIForeman::CreateCommand
+    class ScheduleCommand < HammerCLIForeman::Command
       command_name "schedule"
       action :schedule_report
 
@@ -93,6 +93,10 @@ module HammerCLIForeman
         params
       end
 
+      def transform_format(data)
+        data
+      end
+
       def execute
         data = send_request
         if option_wait?
@@ -119,7 +123,7 @@ module HammerCLIForeman
 
       def build_report_data_args(schedule_data)
         [
-          '--id', option_id,
+          '--id', options['option_id'],
           '--job-id', schedule_data['job_id'],
           '--path', option_path
         ]