hammer_cli_foreman 0.17.2 → 0.18.0

data/lib/hammer_cli_foreman/common_parameter.rb

@@ -32,9 +32,11 @@ module HammerCLIForeman
         :default => 'string',
         :format => HammerCLI::Options::Normalizers::Enum.new(Parameter::KEY_TYPES)
 
-      def action
+      attr_reader :action
+
+      def execute
         @action ||= parameter_exist? ? :update : :create
-        @action
+        super
       end
 
       def success_message

data/lib/hammer_cli_foreman/compute_attribute.rb

@@ -1,6 +1,6 @@
-require 'hammer_cli_foreman/image'
 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 'hammer_cli_foreman/image'
 
 module HammerCLIForeman
   class ComputeAttribute < HammerCLIForeman::Command
@@ -22,7 +22,7 @@ module HammerCLIForeman
     end
 
     class Create < HammerCLIForeman::CreateCommand
-        desc _('Create compute profile set of values')
+      desc _('Create compute profile set of values')
 
       option '--compute-attributes', 'COMPUTE_ATTRS', _('Compute resource attributes'),
              :format => HammerCLI::Options::Normalizers::KeyValueList.new
@@ -31,10 +31,6 @@ module HammerCLIForeman
       option '--volume', 'VOLUME', _('Volume parameters, should be comma separated list of values'),
              :format => HammerCLI::Options::Normalizers::KeyValueList.new, :multivalued => true
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :all)
-      end
-
       validate_options do
         any(:option_compute_profile_id, :option_compute_profile_name ).required
         any(:option_compute_resource_id, :option_compute_resource_name).required
@@ -42,7 +38,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        compute_resource_name = HammerCLIForeman.record_to_common_format(HammerCLIForeman.foreman_resource(:compute_resources).call(:show, 'id' => options["option_compute_resource_id"] ))["provider_friendly_name"].downcase
+        compute_resource_name = HammerCLIForeman::ComputeResources.resource_provider(options['option_compute_resource_id'])
         interfaces_attr_name = ::HammerCLIForeman.compute_resources[compute_resource_name].interfaces_attrs_name
         params['compute_attribute']['vm_attrs'] = option_compute_attributes || {}
         params['compute_attribute']['vm_attrs'][interfaces_attr_name]= HammerCLIForeman::ComputeAttribute.attribute_hash(option_interface_list) unless option_interface_list.empty?
@@ -53,6 +49,8 @@ module HammerCLIForeman
       success_message _('Compute profile attributes are set.')
       failure_message _('Could not set the compute profile attributes')
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.new)
     end
 
     class Update < HammerCLIForeman::UpdateCommand
@@ -65,20 +63,15 @@ module HammerCLIForeman
       option '--volume', 'VOLUME', _('Volume parameters, should be comma separated list of values'),
              :format => HammerCLI::Options::Normalizers::KeyValueList.new, :multivalued => true
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :all)
-      end
-
       validate_options do
         any(:option_compute_profile_id, :option_compute_profile_name ).required
         any(:option_compute_resource_id, :option_compute_resource_name).required
       end
 
-
       def request_params
 
         params = HammerCLIForeman::ComputeAttribute.get_params(options)
-        compute_resource_name = HammerCLIForeman.record_to_common_format(HammerCLIForeman.foreman_resource(:compute_resources).call(:show, 'id' => options["option_compute_resource_id"] ))["provider_friendly_name"].downcase
+        compute_resource_name = HammerCLIForeman::ComputeResources.resource_provider(options['option_compute_resource_id'])
         interfaces_attr_name = ::HammerCLIForeman.compute_resources[compute_resource_name].interfaces_attrs_name
 
         raise ArgumentError, "Compute profile value to update does not exist yet; it needs to be created first" if !params['compute_attribute'].key?('id')
@@ -102,6 +95,8 @@ module HammerCLIForeman
       failure_message _('Could not update the compute profile attributes')
 
       build_options :without => :id
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.new)
     end
 
     # Using the Update command because adding a new interface is done by modifying existing compute_attribute
@@ -111,10 +106,6 @@ module HammerCLIForeman
       option '--interface', 'SET_VALUES', _('Interface parameters, should be comma separated list of values'),
              :format => HammerCLI::Options::Normalizers::KeyValueList.new, :required => true
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :interface)
-      end
-
       def validate_options
         super
         validator.any(:option_compute_profile_id,:option_compute_profile_name).required
@@ -125,9 +116,7 @@ module HammerCLIForeman
         params = HammerCLIForeman::ComputeAttribute.get_params(options)
 
         raise ArgumentError, "Compute profile value to update does not exist yet; it needs to be created first" if !params['compute_attribute'].key?('id')
-        compute_resource_name = HammerCLIForeman.record_to_common_format(HammerCLIForeman.foreman_resource(:compute_resources).call(:show, 'id' => options["option_compute_resource_id"] ))["provider_friendly_name"].downcase
-
-
+        compute_resource_name = HammerCLIForeman::ComputeResources.resource_provider(options['option_compute_resource_id'])
         interfaces_attr_name = ::HammerCLIForeman.compute_resources[compute_resource_name].interfaces_attrs_name
         interface_attr =  params['compute_attribute']['vm_attrs'][interfaces_attr_name] || {}
         new_interface_id = (interface_attr.keys.max.to_i + 1 ).to_s if interface_attr.any?
@@ -143,6 +132,8 @@ module HammerCLIForeman
       failure_message _('Could not create interface')
 
       build_options :without => :id
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(attributes: :interface).new)
     end
 
     class UpdateInterface < HammerCLIForeman::UpdateCommand
@@ -157,10 +148,6 @@ module HammerCLIForeman
              :required => true,
              :format => HammerCLI::Options::Normalizers::Number.new
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :interface)
-      end
-
       def validate_options
         super
         validator.any(:option_compute_profile_id, :option_compute_profile_name).required
@@ -170,7 +157,7 @@ module HammerCLIForeman
       def request_params
         params = HammerCLIForeman::ComputeAttribute.get_params(options)
         raise ArgumentError, "Compute profile value to update does not exist yet; it needs to be created first" if !params['compute_attribute'].key?('id')
-        compute_resource_name = HammerCLIForeman.record_to_common_format(HammerCLIForeman.foreman_resource(:compute_resources).call(:show, 'id' => options["option_compute_resource_id"] ))["provider_friendly_name"].downcase
+        compute_resource_name = HammerCLIForeman::ComputeResources.resource_provider(options['option_compute_resource_id'])
         interfaces_attr_name = ::HammerCLIForeman.compute_resources[compute_resource_name].interfaces_attrs_name
         params['id'] = params['compute_attribute']['id']
         params['compute_attribute']['vm_attrs'][interfaces_attr_name] ||= {}
@@ -180,6 +167,8 @@ module HammerCLIForeman
       success_message _('Interface was updated.')
       failure_message _('Could not update interface')
       build_options :without => :id
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(attributes: :interface).new)
     end
 
     # Using the Update command because removing an interface is done by modifying existing compute_attribute
@@ -198,7 +187,7 @@ module HammerCLIForeman
       def request_params
         params = HammerCLIForeman::ComputeAttribute.get_params(options)
         raise ArgumentError, "Compute profile value to update does not exist yet; it needs to be created first" if !params['compute_attribute'].key?('id')
-        compute_resource_name = HammerCLIForeman.record_to_common_format(HammerCLIForeman.foreman_resource(:compute_resources).call(:show, 'id' => options["option_compute_resource_id"] ))["provider_friendly_name"].downcase
+        compute_resource_name = HammerCLIForeman::ComputeResources.resource_provider(options['option_compute_resource_id'])
         interfaces_attr_name = ::HammerCLIForeman.compute_resources[compute_resource_name].interfaces_attrs_name
         params['id'] = params['compute_attribute']['id']
         if params['compute_attribute']['vm_attrs'][interfaces_attr_name].has_key?(option_interface_id.to_s)
@@ -221,10 +210,6 @@ module HammerCLIForeman
       option '--volume', 'VOLUME', _('Volume parameters, should be comma separated list of values'),
              :format => HammerCLI::Options::Normalizers::KeyValueList.new, :required => true
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :volume)
-      end
-
       def validate_options
         super
         validator.any(:option_compute_profile_id, :option_compute_profile_name).required
@@ -246,6 +231,8 @@ module HammerCLIForeman
       success_message _('Volume was created.')
       failure_message _('Could not create volume')
       build_options :without => :id
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(attributes: :volume).new)
     end
 
     class UpdateVolume < HammerCLIForeman::UpdateCommand
@@ -259,11 +246,6 @@ module HammerCLIForeman
              :required => true,
              :format => HammerCLI::Options::Normalizers::Number.new
 
-      extend_help do |h|
-        ::HammerCLIForeman::ComputeResources.extend_help(h, :volume)
-      end
-
-
       def validate_options
         super
         validator.any(:option_compute_profile_id, :option_compute_profile_name).required
@@ -281,6 +263,8 @@ module HammerCLIForeman
       success_message _('Volume was updated.')
       failure_message _('Could not update volume')
       build_options :without => :id
+
+      extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(attributes: :volume).new)
     end
 
     # Using the Update command because removing a volume is done by modifying existing compute_attribute

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -1,7 +1,6 @@
 require 'hammer_cli_foreman/image'
 require 'hammer_cli_foreman/compute_resource/register_compute_resources'
 
-
 module HammerCLIForeman
 
   class ComputeResource < HammerCLIForeman::Command
@@ -31,27 +30,6 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
       include ProviderNameLegacy
 
-      PROVIDER_SPECIFIC_FIELDS = {
-        'ovirt' => [
-          Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter])
-        ],
-        'ec2' => [
-          Fields::Field.new(:label => _('Region'), :path => [:region])
-        ],
-        'vmware' => [
-          Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
-          Fields::Field.new(:label => _('Server'), :path => [:server])
-        ],
-        'openstack' => [
-          Fields::Field.new(:label => _('Tenant'), :path => [:tenant])
-        ],
-        'rackspace' => [
-          Fields::Field.new(:label => _('Region'), :path => [:region])
-        ],
-        'libvirt' => [
-        ]
-      }
-
       output ListCommand.output_definition do
         field :url, _("Url")
         field :description, _("Description")
@@ -61,9 +39,11 @@ module HammerCLIForeman
       end
 
       def print_data(data)
-        provider = data["provider"].downcase
-        output_definition.fields.concat(PROVIDER_SPECIFIC_FIELDS[provider] || [])
-        super(data)
+        provider = ::HammerCLIForeman.compute_resources[data['provider'].downcase]
+        if provider
+          output_definition.fields.concat(provider.provider_specific_fields || [])
+          super(data)
+        end
       end
 
       build_options

data/lib/hammer_cli_foreman/compute_resource/base.rb

@@ -1,12 +1,14 @@
 module HammerCLIForeman
   module ComputeResources
     class Base
-      attr_reader :name
+      def name; ''; end
       def compute_attributes; []; end
       def interface_attributes; []; end
       def volume_attributes; []; end
-      def interfaces_attrs_name; "interfaces_attributes" ; end
-      def mandatory_resource_options; [:name, :provider]; end
+      def interfaces_attrs_name; 'interfaces_attributes'; end
+      def host_attributes; []; end
+      def provider_specific_fields; []; end
+      def mandatory_resource_options; %i[name provider]; end
     end
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/ec2.rb

@@ -2,23 +2,24 @@ module HammerCLIForeman
   module ComputeResources
     class EC2 < Base
       def name
-        _('EC2')
+        'EC2'
       end
 
       def compute_attributes
+        %w[flavor_id image_id availability_zone security_group_ids managed_ip]
+      end
+
+      def provider_specific_fields
         [
-            'flavor_id',
-            'image_id',
-            'availability_zone',
-            'security_group_ids',
-            'managed_ip'
+          Fields::Field.new(:label => _('Region'), :path => [:region])
         ]
       end
 
       def mandatory_resource_options
-        super + [:region, :user, :password]
+        super + %i[region user password]
       end
     end
-    HammerCLIForeman.register_compute_resource('ec2', EC2.new )
+
+    HammerCLIForeman.register_compute_resource('ec2', EC2.new)
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/gce.rb

@@ -2,22 +2,36 @@ module HammerCLIForeman
   module ComputeResources
     class GCE < Base
       def name
-        _('GCE')
+        'GCE'
       end
 
       def compute_attributes
+        %w[machine_type image_id network associate_external_ip]
+      end
+
+      def interfaces_attrs_name
+        'network_interfaces_nics_attributes'
+      end
+
+      def volume_attributes
         [
-            'machine_type',
-            'image_id',
-            'network',
-            'external_ip'
+          ['size_gb', _('Volume size in GB, integer value')]
         ]
       end
 
-      def interfaces_attrs_name
-        "network_interfaces_nics_attributes"
+      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]),
+        ]
+      end
+
+      def mandatory_resource_options
+        super + %I{project key_path zone}
       end
     end
+
     HammerCLIForeman.register_compute_resource('gce', GCE.new)
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/libvirt.rb

@@ -2,48 +2,47 @@ module HammerCLIForeman
   module ComputeResources
     class Libvirt < Base
       def name
-        _('Libvirt')
+        'Libvirt'
       end
 
       def compute_attributes
         [
-            ['cpus',   _('Number of CPUs')],
-            ['memory', _('String, amount of memory, value in bytes')],
-            ['start',  _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
+          ['cpus',   _('Number of CPUs')],
+          ['memory', _('String, amount of memory, value in bytes')]
         ]
       end
 
       def host_attributes
         [
-            ['start',  _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
+          ['start',  _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
         ]
       end
 
       def interface_attributes
         [
-            ['type',   _('Possible values: %s') % 'bridge, network'],
-            ['bridge', _('Name of interface according to type')],
-            ['model',  _('Possible values: %s') % 'virtio, rtl8139, ne2k_pci, pcnet, e1000']
+          ['type',   _('Possible values: %s') % 'bridge, network'],
+          ['bridge', _('Name of interface according to type')],
+          ['model',  _('Possible values: %s') % 'virtio, rtl8139, ne2k_pci, pcnet, e1000']
         ]
       end
 
       def volume_attributes
         [
-            ['pool_name',   _('One of available storage pools')],
-            ['capacity',    _('String value, eg. 10G')],
-            ['format_type', _('Possible values: %s') % 'raw, qcow2']
+          ['pool_name',   _('One of available storage pools')],
+          ['capacity',    _('String value, eg. 10G')],
+          ['format_type', _('Possible values: %s') % 'raw, qcow2']
         ]
       end
 
       def interfaces_attrs_name
-        "nics_attributes"
+        'nics_attributes'
       end
 
       def mandatory_resource_options
-        super + [:url]
+        super + %i[url]
       end
-
     end
+
     HammerCLIForeman.register_compute_resource('libvirt', Libvirt.new)
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/openstack.rb

@@ -2,24 +2,26 @@ module HammerCLIForeman
   module ComputeResources
     class OpenStack < Base
       def name
-        _('OpenStack')
+        'OpenStack'
       end
 
       def compute_attributes
+        %w[flavor_ref image_ref tenant_id security_groups network]
+      end
+
+      def provider_specific_fields
         [
-            'flavor_ref',
-            'image_ref',
-            'tenant_id',
-            'security_groups',
-            'network'
+          Fields::Field.new(:label => _('Tenant'), :path => [:tenant]),
+          Fields::Field.new(:label => _('Project domain name'), :path => [:project_domain_name]),
+          Fields::Field.new(:label => _('Project domain ID'), :path => [:project_domain_id])
         ]
       end
 
       def mandatory_resource_options
-        super + [:url, :user, :password]
+        super + %i[url user password]
       end
-
     end
+
     HammerCLIForeman.register_compute_resource('openstack', OpenStack.new)
   end
-end
+end

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -2,46 +2,51 @@ module HammerCLIForeman
   module ComputeResources
     class Ovirt < Base
       def name
-        _('oVirt')
+        'oVirt'
       end
 
       def compute_attributes
         [
-            ['cluster', _('ID of cluster to use')],
-            ['template', _('Hardware profile to use')],
-            ['cores',    _('Integer value, number of cores')],
-            ['memory',   _('Amount of memory, integer value in bytes')],
+          ['cluster',  _('ID of cluster to use')],
+          ['template', _('Hardware profile to use')],
+          ['cores',    _('Integer value, number of cores')],
+          ['memory',   _('Amount of memory, integer value in bytes')]
         ]
       end
 
       def host_attributes
         [
-            ['start',    _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
-
+          ['start', _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
         ]
       end
 
       def interface_attributes
         [
-            ['name',    _('compute name, Eg. eth0')],
-            ['network', _('Select one of available networks for a cluster, must be an ID')],
-            ['interface', ('interface type')]
+          ['name',      _('Compute name, e.g. eth0')],
+          ['network',   _('Select one of available networks for a cluster, must be an ID')],
+          ['interface', _('Interface type')]
         ]
       end
 
-      def volume_attributes;
+      def volume_attributes
         [
-            ['size_gb',        _('Volume size in GB, integer value')],
-            ['storage_domain', _('ID of storage domain')],
-            ['bootable',       _('Boolean, only one volume can be bootable')]
+          ['size_gb',        _('Volume size in GB, integer value')],
+          ['storage_domain', _('ID of storage domain')],
+          ['bootable',       _('Boolean, only one volume can be bootable')]
         ]
       end
 
-      def mandatory_resource_options
-        super + [:url, :user, :password, :datacenter]
+      def provider_specific_fields
+        [
+          Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter])
+        ]
       end
 
+      def mandatory_resource_options
+        super + %i[url user password datacenter]
+      end
     end
+
     HammerCLIForeman.register_compute_resource('ovirt', Ovirt.new)
   end
-end
+end