hammer_cli_foreman 0.0.15 → 0.0.16

data/lib/hammer_cli_foreman/host.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/parameter'
 require 'hammer_cli_foreman/report'
 require 'hammer_cli_foreman/puppet_class'
 require 'hammer_cli_foreman/smart_class_parameter'
@@ -34,12 +30,15 @@ module HammerCLIForeman
       base.option "--puppetclass-ids", "PUPPETCLASS_IDS", " ",
         :format => HammerCLI::Options::Normalizers::List.new
 
-      base.option "--build", "BUILD", " ", :default => 'true',
-        :format => HammerCLI::Options::Normalizers::Bool.new
-      base.option "--managed", "MANAGED", " ", :default => 'true',
-        :format => HammerCLI::Options::Normalizers::Bool.new
-      base.option "--enabled", "ENABLED", " ",  :default => 'true',
-        :format => HammerCLI::Options::Normalizers::Bool.new
+      bme_options = {}
+      bme_options[:default] = 'true' if base.action.to_sym == :create
+
+      bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
+      base.option "--managed", "MANAGED", " ", bme_options
+      bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
+      base.option "--build", "BUILD", " ", bme_options
+      bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
+      base.option "--enabled", "ENABLED", " ",  bme_options
 
       base.option "--parameters", "PARAMS", "Host parameters.",
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
@@ -49,28 +48,27 @@ module HammerCLIForeman
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
       base.option "--interface", "INTERFACE", "Interface parameters.", :multivalued => true,
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
-
     end
 
     def request_params
       params = super
 
-      params['host']['build'] = build
-      params['host']['managed'] = managed
-      params['host']['enabled'] = enabled
+      params['host']['build'] = option_build unless option_build.nil?
+      params['host']['managed'] = option_managed unless option_managed.nil?
+      params['host']['enabled'] = option_enabled unless option_enabled.nil?
 
-      params['host']['puppetclass_ids'] = puppetclass_ids
+      params['host']['puppetclass_ids'] = option_puppetclass_ids unless option_puppetclass_ids.nil?
 
-      params['host']['ptable_id'] = partition_table_id
-      params['host']['compute_resource_id'] = compute_resource_id
+      params['host']['ptable_id'] = option_partition_table_id unless option_partition_table_id.nil?
+      params['host']['compute_resource_id'] = option_compute_resource_id unless option_compute_resource_id.nil?
       params['host']['host_parameters_attributes'] = parameter_attributes
-      params['host']['compute_attributes'] = compute_attributes || {}
-      params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(volume_list)
-      if compute_resource_id
-        params['host']['compute_attributes']['interfaces_attributes'] = nested_attributes(interface_list)
-        params['host']['compute_attributes']['nics_attributes'] = nested_attributes(interface_list)
+      params['host']['compute_attributes'] = option_compute_attributes || {}
+      params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(option_volume_list)
+      if option_compute_resource_id
+        params['host']['compute_attributes']['interfaces_attributes'] = nested_attributes(option_interface_list)
+        params['host']['compute_attributes']['nics_attributes'] = nested_attributes(option_interface_list)
       else
-        params['host']['interfaces_attributes'] = nested_attributes(interface_list)
+        params['host']['interfaces_attributes'] = nested_attributes(option_interface_list)
       end
 
       params
@@ -79,8 +77,8 @@ module HammerCLIForeman
     private
 
     def parameter_attributes
-      return {} unless parameters
-      parameters.collect do |key, value|
+      return {} unless option_parameters
+      option_parameters.collect do |key, value|
         {"name"=>key, "value"=>value, "nested"=>""}
       end
     end
@@ -170,6 +168,8 @@ module HammerCLIForeman
           field nil, nil, Fields::KeyValue
         end
       end
+
+      apipie_options
     end
 
 
@@ -207,6 +207,8 @@ module HammerCLIForeman
         status = resource.call(:power, params)[0]
         status["power"]
       end
+
+      apipie_options
     end
 
 
@@ -218,6 +220,8 @@ module HammerCLIForeman
       def print_data(records)
         print_message 'Puppet run triggered'
       end
+
+      apipie_options
     end
 
 
@@ -284,7 +288,6 @@ module HammerCLIForeman
       def search
         'host.id = %s' % get_identifier[0].to_s
       end
-
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
@@ -296,10 +299,10 @@ module HammerCLIForeman
       include HammerCLIForeman::CommonHostUpdateOptions
 
       validate_options do
-        unless option(:hostgroup_id).exist?
-          all(:environment_id, :architecture_id, :domain_id,
-            :puppet_proxy_id, :operatingsystem_id,
-            :partition_table_id).required
+        unless option(:option_hostgroup_id).exist?
+          all(:option_environment_id, :option_architecture_id, :option_domain_id,
+            :option_puppet_proxy_id, :option_operatingsystem_id,
+            :option_partition_table_id).required
         end
       end
     end
@@ -338,12 +341,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:host_name, :host_id).required
+        validator.any(:option_host_name, :option_host_id).required
       end
 
       def base_action_params
         {
-          "host_id" => host_id || host_name
+          "host_id" => option_host_id || option_host_name
         }
       end
     end
@@ -362,12 +365,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:host_name, :host_id).required
+        validator.any(:option_host_name, :option_host_id).required
       end
 
       def base_action_params
         {
-          "host_id" => host_id || host_name
+          "host_id" => option_host_id || option_host_name
         }
       end
     end
@@ -385,6 +388,8 @@ module HammerCLIForeman
       def power_action
         :start
       end
+
+      apipie_options :without => :power_action
     end
 
 
@@ -399,7 +404,7 @@ module HammerCLIForeman
       desc "Power a host off"
 
       def power_action
-        if force?
+        if option_force?
           :cycle
         else
           :stop
@@ -407,12 +412,14 @@ module HammerCLIForeman
       end
 
       def success_message
-        if force?
+        if option_force?
           "Power off forced."
         else
           "Powering the host off."
         end
       end
+
+      apipie_options :without => :power_action
     end
 
     class RebootCommand < HammerCLI::Apipie::WriteCommand
@@ -427,13 +434,15 @@ module HammerCLIForeman
       def power_action
         :soft
       end
+
+      apipie_options :without => :power_action
     end
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
 
       apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
       option ['--id', '--name'], 'HOST_ID', 'host id/name',
-              :attribute_name => :host_id, :required => true
+              :attribute_name => :option_host_id, :required => true
     end
 
     autoload_subcommands
@@ -441,4 +450,4 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'host', "Manipulate Foreman's hosts.", HammerCLIForeman::Host
+HammerCLI::MainCommand.subcommand 'host', "Manipulate hosts.", HammerCLIForeman::Host

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/parameter'
 require 'hammer_cli_foreman/smart_class_parameter'
 
 module HammerCLIForeman
@@ -42,6 +38,7 @@ module HammerCLIForeman
         hostgroup
       end
 
+      apipie_options
     end
 
 
@@ -116,7 +113,7 @@ module HammerCLIForeman
 
       def base_action_params
         {
-          "hostgroup_id" => hostgroup_id
+          "hostgroup_id" => option_hostgroup_id
         }
       end
     end
@@ -134,7 +131,7 @@ module HammerCLIForeman
 
       def base_action_params
         {
-          "hostgroup_id" => hostgroup_id
+          "hostgroup_id" => option_hostgroup_id
         }
       end
     end
@@ -144,7 +141,7 @@ module HammerCLIForeman
 
       apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
       option ['--id', '--name'], 'HOSTGROUP_ID', 'hostgroup id/name',
-            :attribute_name => :hostgroup_id, :required => true
+            :attribute_name => :option_hostgroup_id, :required => true
     end
 
 
@@ -153,5 +150,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'hostgroup', "Manipulate Foreman's hostgroups.", HammerCLIForeman::Hostgroup
+HammerCLI::MainCommand.subcommand 'hostgroup', "Manipulate hostgroups.", HammerCLIForeman::Hostgroup
 

data/lib/hammer_cli_foreman/image.rb

@@ -1,6 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
 require 'hammer_cli_foreman/compute_resource'
 
 module HammerCLIForeman
@@ -20,7 +17,7 @@ module HammerCLIForeman
         base.apipie_options :without => [:compute_resource_id, :id]
 
         base.validate_options do
-          any(:compute_resource_id, :compute_resource).required
+          any(:option_compute_resource_id, :option_compute_resource).required
         end
       end
 
@@ -41,7 +38,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        params['compute_resource_id'] = compute_resource_id || compute_resource
+        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
         params
       end
 
@@ -50,9 +47,9 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
+      identifiers :id
       include HammerCLIForeman::Image::ComputeResourceOptions
 
-      identifiers :id
 
       output ListCommand.output_definition do
         field :architecture_id, "Architecture Id", Fields::Id
@@ -63,7 +60,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        params['compute_resource_id'] = compute_resource_id || compute_resource
+        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
         params
       end
 
@@ -85,7 +82,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        params['id'] = compute_resource_id || compute_resource
+        params['id'] = option_compute_resource_id || option_compute_resource
         params
       end
 
@@ -101,7 +98,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        params['compute_resource_id'] = compute_resource_id || compute_resource
+        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
         params
       end
     end
@@ -109,31 +106,32 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
+      identifiers :id
       include HammerCLIForeman::Image::ComputeResourceOptions
 
       success_message "Image updated"
       failure_message "Could not update the image"
-      identifiers :id
 
       def request_params
         params = super
-        params['compute_resource_id'] = compute_resource_id || compute_resource
+        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
         params
       end
+
     end
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
+      identifiers :id
       include HammerCLIForeman::Image::ComputeResourceOptions
 
       success_message "Image deleted"
       failure_message "Could not delete the image"
-      identifiers :id
 
       def request_params
         params = super
-        params['compute_resource_id'] = compute_resource_id || compute_resource
+        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
         params
       end
 

data/lib/hammer_cli_foreman/location.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
 require 'hammer_cli_foreman/resource_supported_test'
 
 module HammerCLIForeman
@@ -30,6 +26,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -78,5 +75,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'location', "Manipulate Foreman's locations.", HammerCLIForeman::Location
+HammerCLI::MainCommand.subcommand 'location', "Manipulate locations.", HammerCLIForeman::Location
 

data/lib/hammer_cli_foreman/media.rb

@@ -1,8 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
-
 module HammerCLIForeman
 
   class Medium < HammerCLI::Apipie::Command
@@ -28,6 +23,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -67,5 +63,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'medium', "Manipulate Foreman's installation media.", HammerCLIForeman::Medium
+HammerCLI::MainCommand.subcommand 'medium', "Manipulate installation media.", HammerCLIForeman::Medium
 

data/lib/hammer_cli_foreman/model.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class Model < HammerCLI::Apipie::Command
@@ -29,6 +25,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -42,6 +39,8 @@ module HammerCLIForeman
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message "Hardware model deleted"
       failure_message "Could not delete the hardware model"
+
+      apipie_options
     end
 
 
@@ -58,5 +57,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'model', "Manipulate Foreman's hardware models.", HammerCLIForeman::Model
+HammerCLI::MainCommand.subcommand 'model', "Manipulate hardware models.", HammerCLIForeman::Model
 

data/lib/hammer_cli_foreman/operating_system.rb

@@ -1,8 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
-
 module HammerCLIForeman
 
   class OperatingSystem < HammerCLI::Apipie::Command
@@ -52,6 +47,7 @@ module HammerCLIForeman
         os
       end
 
+      apipie_options
     end
 
 
@@ -72,10 +68,10 @@ module HammerCLIForeman
 
       def request_params
         params = method_options
-        params["operatingsystem"]["architecture_ids"] = architecture_ids if architecture_ids
-        params["operatingsystem"]["config_template_ids"] = config_template_ids if config_template_ids
-        params["operatingsystem"]["medium_ids"] = medium_ids if medium_ids
-        params["operatingsystem"]["ptable_ids"] = ptable_ids if ptable_ids
+        params["operatingsystem"]["architecture_ids"] = option_architecture_ids if option_architecture_ids
+        params["operatingsystem"]["config_template_ids"] = option_config_template_ids if option_config_template_ids
+        params["operatingsystem"]["medium_ids"] = option_medium_ids if option_medium_ids
+        params["operatingsystem"]["ptable_ids"] = option_ptable_ids if option_ptable_ids
         params
       end
 
@@ -102,10 +98,10 @@ module HammerCLIForeman
 
       def request_params
         params = method_options
-        params["operatingsystem"]["architecture_ids"] = architecture_ids if architecture_ids
-        params["operatingsystem"]["config_template_ids"] = config_template_ids if config_template_ids
-        params["operatingsystem"]["medium_ids"] = medium_ids if medium_ids
-        params["operatingsystem"]["ptable_ids"] = ptable_ids if ptable_ids
+        params["operatingsystem"]["architecture_ids"] = option_architecture_ids if option_architecture_ids
+        params["operatingsystem"]["config_template_ids"] = option_config_template_ids if option_config_template_ids
+        params["operatingsystem"]["medium_ids"] = option_medium_ids if option_medium_ids
+        params["operatingsystem"]["ptable_ids"] = option_ptable_ids if option_ptable_ids
         params
       end
 
@@ -138,12 +134,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:os_id).required
+        validator.any(:option_os_id).required
       end
 
       def base_action_params
         {
-          "operatingsystem_id" => os_id
+          "operatingsystem_id" => option_os_id
         }
       end
     end
@@ -161,12 +157,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:os_id).required
+        validator.any(:option_os_id).required
       end
 
       def base_action_params
         {
-          "operatingsystem_id" => os_id
+          "operatingsystem_id" => option_os_id
         }
       end
     end
@@ -182,5 +178,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'os', "Manipulate Foreman's operating system.", HammerCLIForeman::OperatingSystem
+HammerCLI::MainCommand.subcommand 'os', "Manipulate operating system.", HammerCLIForeman::OperatingSystem
 

data/lib/hammer_cli_foreman/organization.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
 require 'hammer_cli_foreman/resource_supported_test'
 
 module HammerCLIForeman
@@ -30,6 +26,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -77,5 +74,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'organization', "Manipulate Foreman's organizations.", HammerCLIForeman::Organization
+HammerCLI::MainCommand.subcommand 'organization', "Manipulate organizations.", HammerCLIForeman::Organization
 

data/lib/hammer_cli_foreman/output.rb

@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'output/fields')
-require File.join(File.dirname(__FILE__), 'output/formatters')
+require 'hammer_cli_foreman/output/fields'
+require 'hammer_cli_foreman/output/formatters'

data/lib/hammer_cli_foreman/parameter.rb

@@ -1,6 +1,4 @@
-require 'hammer_cli'
 require 'hammer_cli/messages'
-require 'foreman_api'
 
 module HammerCLIForeman
 
@@ -47,14 +45,14 @@ module HammerCLIForeman
 
       def parameter_exist?
         params = HammerCLIForeman.collection_to_common_format(resource.call(:index, base_action_params)[0])
-        params.find { |p| p["name"] == name }
+        params.find { |p| p["name"] == option_name }
       end
 
       def update_parameter
         params = {
-          "id" => name,
+          "id" => option_name,
           "parameter" => {
-            "value" => value
+            "value" => option_value
           }
         }.merge base_action_params
 
@@ -64,8 +62,8 @@ module HammerCLIForeman
       def create_parameter
         params = {
           "parameter" => {
-            "name" => name,
-            "value" => value
+            "name" => option_name,
+            "value" => option_value
           }
         }.merge base_action_params
 
@@ -91,7 +89,7 @@ module HammerCLIForeman
 
       def execute
         params = {
-          "id" => name
+          "id" => option_name
         }.merge base_action_params
 
         HammerCLIForeman.record_to_common_format(resource.call(:destroy, params))

data/lib/hammer_cli_foreman/partition_table.rb

@@ -1,8 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
-
 module HammerCLIForeman
 
   class PartitionTable < HammerCLI::Apipie::Command
@@ -28,6 +23,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -36,18 +32,18 @@ module HammerCLIForeman
       command_name "dump"
       desc "View partition table content."
 
-
       def print_data(partition_table)
         puts partition_table["layout"]
       end
 
+      apipie_options
     end
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :layout, :required => true,
-        :format => HammerCLI::Options::Normalizers::File.new
+      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :option_layout,
+        :required => true, :format => HammerCLI::Options::Normalizers::File.new
 
       success_message "Partition table created"
       failure_message "Could not create the partition table"
@@ -58,7 +54,7 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :layout,
+      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :option_layout,
         :format => HammerCLI::Options::Normalizers::File.new
 
       success_message "Partition table updated"
@@ -69,9 +65,10 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-
       success_message "Partition table deleted"
       failure_message "Could not delete the partition table"
+
+      apipie_options
     end
 
 
@@ -83,5 +80,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'partition_table', "Manipulate Foreman's partition tables.", HammerCLIForeman::PartitionTable
+HammerCLI::MainCommand.subcommand 'partition_table', "Manipulate partition tables.", HammerCLIForeman::PartitionTable
 

data/lib/hammer_cli_foreman/puppet_class.rb

@@ -1,6 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
 require 'hammer_cli_foreman/smart_class_parameter'
 
 module HammerCLIForeman
@@ -43,6 +40,7 @@ module HammerCLIForeman
         end
       end
 
+      apipie_options
     end
 
 
@@ -59,5 +57,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'puppet_class', "Search Foreman's puppet modules.", HammerCLIForeman::PuppetClass
+HammerCLI::MainCommand.subcommand 'puppet_class', "Search puppet modules.", HammerCLIForeman::PuppetClass