hammer_cli_foreman 0.1.0 → 0.1.1

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -22,39 +22,34 @@ module HammerCLIForeman
         field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
-        field :operatingsystem_id, _("Operating System Id")
-        field :subnet_id, _("Subnet Id")
-        field :domain_id, _("Domain Id")
-        field :architecture_id, _("Architecture Id")
-        field :ptable_id, _("Partition Table Id")
-        field :medium_id, _("Medium Id")
-        field :puppet_ca_proxy_id, _("Puppet CA Proxy Id")
-        field :puppet_proxy_id, _("Puppet Master Proxy Id")
-        field :environment_id, _("Environment Id")
-        field :puppetclass_ids, _("Puppetclass Ids"), Fields::List
+        field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
+        field nil, _("Environment"), Fields::SingleReference, :key => :environment
+        field nil, _("Model"), Fields::SingleReference, :key => :model
         field :ancestry, _("Ancestry")
       end
 
-      apipie_options
+      build_options
     end
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      identifiers :id
-
       output ListCommand.output_definition do
-        collection :parameters, _("Parameters") do
-          field nil, nil, Fields::KeyValue
-        end
-      end
+        field nil, _("Subnet"), Fields::SingleReference, :key => :subnet
 
-      def extend_data(hostgroup)
-        hostgroup["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :hostgroup, hostgroup)
-        hostgroup
+        field nil, _("Domain"), Fields::SingleReference, :key => :domain
+        field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
+        field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
+        field nil, _("Medium"), Fields::SingleReference, :key => :medium
+        field :puppet_ca_proxy_id, _("Puppet CA Proxy Id")
+        field :puppet_proxy_id, _("Puppet Master Proxy Id")
+        field nil, _("ComputeProfile"), Fields::SingleReference, :key => :compute_profile
+        HammerCLIForeman::References.puppetclasses(self)
+        HammerCLIForeman::References.parameters(self)
+        HammerCLIForeman::References.taxonomies(self)
       end
 
-      apipie_options
+      build_options
     end
 
 
@@ -68,103 +63,73 @@ module HammerCLIForeman
       success_message _("Hostgroup created")
       failure_message _("Could not create the hostgroup")
 
-      apipie_options
+      build_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-
       option "--puppetclass-ids", "PUPPETCLASS_IDS", " ",
         :format => HammerCLI::Options::Normalizers::List.new
 
       include HostgroupUpdateCreateCommons
 
-      identifiers :id
-
       success_message _("Hostgroup updated")
       failure_message _("Could not update the hostgroup")
 
-      apipie_options
+      build_options
     end
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-
-      identifiers :id
-
       success_message _("Hostgroup deleted")
       failure_message _("Could not delete the hostgroup")
 
-      apipie_options
+      build_options
     end
 
 
     class PuppetClassesCommand < HammerCLIForeman::ListCommand
-
       command_name "puppet-classes"
       resource :puppetclasses
 
-      identifiers :id
-
       output HammerCLIForeman::PuppetClass::ListCommand.output_definition
 
-      def retrieve_data
+      def send_request
         HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(super)
       end
 
       def request_params
         params = method_options
-        params['hostgroup_id'] = get_identifier[0]
+        params['hostgroup_id'] = get_identifier
         params
       end
 
-      apipie_options
+      build_options
     end
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-
-      resource :parameters
-
       desc _("Create or update parameter for a hostgroup.")
 
-      option "--hostgroup-id", "HOSTGROUP_ID", _("id of the hostgroup the parameter is being set for"), :required => true
-
       success_message_for :update, _("Hostgroup parameter updated")
       success_message_for :create, _("New hostgroup parameter created")
       failure_message _("Could not set hostgroup parameter")
 
-      def base_action_params
-        {
-          "hostgroup_id" => option_hostgroup_id
-        }
-      end
+      build_options
     end
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-
-      resource :parameters
-
       desc _("Delete parameter for a hostgroup.")
 
-      option "--hostgroup-id", "HOSTGROUP_ID", _("id of the hostgroup the parameter is being deleted for"), :required => true
-
       success_message _("Hostgroup parameter deleted")
 
-      def base_action_params
-        {
-          "hostgroup_id" => option_hostgroup_id
-        }
-      end
+      build_options
     end
 
-
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-
-      apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
-      option ['--id', '--name'], 'HOSTGROUP_ID', _('hostgroup id/name'),
-            :attribute_name => :option_hostgroup_id, :required => true
+      parent_resource :hostgroups
+      build_options
     end
 
 

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -0,0 +1,163 @@
+module HammerCLIForeman
+
+  class Searchable
+
+    def initialize(name, description, options={})
+      @name = name
+      @description = description
+      @editable = options[:editable].nil? ? true : options[:editable]
+    end
+
+    attr_reader :name, :description
+
+    def editable?
+      @editable
+    end
+
+  end
+
+  class Searchables
+
+    SEARCHABLES = {
+      :user => [ Searchable.new("login", _("User's login to search by")) ],
+      :template => [],
+      :image => [],
+      :operatingsystem => []
+    }
+    DEFAULT_SEARCHABLES = [ Searchable.new("name", _("Name to search by")) ]
+
+    def for(resource)
+      SEARCHABLES[resource.singular_name.to_sym] || DEFAULT_SEARCHABLES
+    end
+
+  end
+
+  class IdResolver
+
+    attr_reader :api
+
+    def initialize(api, searchables)
+      @api = api
+      @searchables = searchables
+      define_id_finders
+    end
+
+    def scoped_options(scope, options)
+      prefix = HammerCLI.option_accessor_name("#{scope}_")
+      plain_prefix = HammerCLI.option_accessor_name("")
+
+      scoped_options = options.dup
+      options.each do |k, v|
+        if k.start_with? prefix
+          # remove the scope
+          # e.g. option_architecture_id -> option_id
+          scoped_options[k.sub(prefix, plain_prefix)] = v
+          scoped_options.delete(k)
+        end
+      end
+      scoped_options
+    end
+
+    def dependent_resources(resource, options={})
+      options[:required] = (options[:required] == true)
+      options[:recursive] = !(options[:recursive] == false)
+
+      resolve_dependent_resources(resource, [], options)
+    end
+
+    def id_params(action, options={})
+      required = !(options[:required] == false)
+
+      params = action.params.reject{ |p| !(p.name.end_with?("_id")) }
+      params = params.reject{ |p| !(p.required?) } if required
+      params
+    end
+
+    def param_to_resource(param_name)
+      resource_name = param_name.gsub(/_id$/, "")
+      resource_name = ApipieBindings::Inflector.pluralize(resource_name.to_s).to_sym
+      begin
+        @api.resource(resource_name)
+      rescue NameError
+        nil
+      end
+    end
+
+    protected
+
+    def resolve_dependent_resources(resource, resources_found, options)
+      id_params(resource.action(:index), :required => options[:required]).each do |param|
+        res = param_to_resource(param.name)
+        if res and !resources_found.map(&:name).include?(res.name)
+          resources_found << res
+          resolve_dependent_resources(res, resources_found, options) if options[:recursive]
+        end
+      end
+      resources_found
+    end
+
+    def define_id_finders
+      @api.resources.each do |resource|
+        method_name = "#{resource.singular_name}_id"
+
+        self.class.send(:define_method, method_name) do |options|
+          get_id(resource.name, options)
+        end unless respond_to?(method_name)
+      end
+    end
+
+    def get_id(resource_name, options)
+      options[HammerCLI.option_accessor_name("id")] || find_resource(resource_name, options)['id']
+    end
+
+    def find_resource(resource_name, options)
+      resource = @api.resource(resource_name)
+
+      search_options = search_options(options, resource)
+      id_params(resource.action(:index), :required => true).each do |param|
+        search_options[param.name] ||= send(param.name, scoped_options(param.name.gsub(/_id$/, ""), options))
+      end
+      resource.action(:index).routes.each do |route|
+        route.params_in_path.each do |param|
+          key = HammerCLI.option_accessor_name(param.to_s)
+          if options[key]
+            search_options[param] ||= options[key]
+          end
+        end
+      end
+
+      results = resource.call(:index, search_options)
+      results = HammerCLIForeman.collection_to_common_format(results)
+
+      pick_result(results, resource)
+    end
+
+    def pick_result(results, resource)
+      raise ResolverError.new(_("%s not found") % resource.singular_name) if results.empty?
+      raise ResolverError.new(_("%s found more than once") % resource.singular_name) if results.count > 1
+      results[0]
+    end
+
+    def search_options(options, resource)
+      search_options = create_search_options(options, resource)
+      raise MissingSeachOptions.new(_("Missing options to search %s") % resource.singular_name) if search_options.empty?
+      search_options
+    end
+
+    def searchables(resource)
+      @searchables.for(resource)
+    end
+
+    def create_search_options(options, resource)
+      searchables(resource).each do |s|
+        value = options[HammerCLI.option_accessor_name(s.name.to_s)]
+        if value
+          return {:search => "#{s.name} = \"#{value}\""}
+        end
+      end
+      {}
+    end
+
+  end
+
+end

data/lib/hammer_cli_foreman/image.rb

@@ -12,12 +12,10 @@ module HammerCLIForeman
     module ComputeResourceOptions
 
       def self.included(base)
-        base.option "--compute-resource", "COMPUTE_RESOURCE_NAME", _("Compute resource's name")
-        base.option "--compute-resource-id", "COMPUTE_RESOURCE_ID", _("Compute resource's id")
-        base.apipie_options :without => [:compute_resource_id, :id]
+        base.build_options
 
         base.validate_options do
-          any(:option_compute_resource_id, :option_compute_resource).required
+          any(:option_compute_resource_id, :option_compute_resource_name).required
         end
       end
 
@@ -31,39 +29,24 @@ module HammerCLIForeman
       output do
         field :id, _("Id")
         field :name, _("Name")
-        field :operatingsystem_id, _("Operating System Id"), Fields::Id
+        field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
         field :username, _("Username")
         field :uuid, _("UUID")
       end
 
-      def request_params
-        params = super
-        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
-        params
-      end
-
     end
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      identifiers :id
       include HammerCLIForeman::Image::ComputeResourceOptions
 
 
       output ListCommand.output_definition do
-        field :architecture_id, _("Architecture Id"), Fields::Id
+        field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
         field :iam_role, _("IAM role")
-        field :created_at, _("Created at"), Fields::Date
-        field :updated_at, _("Updated at"), Fields::Date
-      end
-
-      def request_params
-        params = super
-        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
-        params
+        HammerCLIForeman::References.timestamps(self)
       end
-
     end
 
 
@@ -73,19 +56,22 @@ module HammerCLIForeman
       command_name 'available'
       desc _("Show images available for addition")
 
-      include HammerCLIForeman::Image::ComputeResourceOptions
+      option "--compute-resource-id", "ID", " "
+      option "--compute-resource", "NAME", " ", :attribute_name => :option_compute_resource_name
 
-      output do
-        field :name, _("Name")
-        field :uuid, _("UUID")
-      end
+      include HammerCLIForeman::Image::ComputeResourceOptions
 
       def request_params
         params = super
-        params['id'] = option_compute_resource_id || option_compute_resource
+        params['id'] ||= get_identifier
         params
       end
 
+      output do
+        field :name, _("Name")
+        field :uuid, _("UUID")
+      end
+
     end
 
 
@@ -95,46 +81,24 @@ module HammerCLIForeman
 
       success_message _("Image created")
       failure_message _("Could not create the image")
-
-      def request_params
-        params = super
-        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
-        params
-      end
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      identifiers :id
       include HammerCLIForeman::Image::ComputeResourceOptions
 
       success_message _("Image updated")
       failure_message _("Could not update the image")
-
-      def request_params
-        params = super
-        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")
-
-      def request_params
-        params = super
-        params['compute_resource_id'] = option_compute_resource_id || option_compute_resource
-        params
-      end
-
     end
 
     autoload_subcommands