hammer_cli_foreman 0.1.3 → 0.1.4

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -6,18 +6,21 @@ module HammerCLIForeman
   module HostgroupUpdateCreateCommons
 
     def self.included(base)
-      base.option "--puppetclass-ids", "PUPPETCLASS_IDS", _("List of puppetclass ids"),
+      base.option "--puppet-class-ids", "PUPPETCLASS_IDS", _("List of puppetclass ids"),
         :format => HammerCLI::Options::Normalizers::List.new
       base.option "--puppet-ca-proxy", "PUPPET_CA_PROXY_NAME", _("Name of puppet CA proxy")
       base.option "--puppet-proxy", "PUPPET_PROXY_NAME",  _("Name of puppet proxy")
+      base.option "--parent", "PARENT_NAME",  _("Name of parent hostgroup")
+      base.option "--puppet-classes", "PUPPET_CLASS_NAMES", "",
+        :format => HammerCLI::Options::Normalizers::List.new
     end
 
     def request_params
       params = super
-
+      params['hostgroup']["parent_id"] ||= resolver.hostgroup_id('option_name' => option_parent) if option_parent
       params['hostgroup']["puppet_proxy_id"] ||= proxy_id(option_puppet_proxy)
       params['hostgroup']["puppet_ca_proxy_id"] ||= proxy_id(option_puppet_ca_proxy)
-      params['hostgroup']['puppetclass_ids'] = option_puppetclass_ids
+      params['hostgroup']['puppetclass_ids'] = option_puppet_class_ids || puppet_class_ids(option_puppet_classes)
       params
     end
 
@@ -27,6 +30,10 @@ module HammerCLIForeman
       resolver.smart_proxy_id('option_name' => name) if name
     end
 
+    def puppet_class_ids(names)
+      resolver.puppetclass_ids('option_names' => names) if names
+    end
+
   end
 
   class Hostgroup < HammerCLIForeman::Command
@@ -38,11 +45,10 @@ module HammerCLIForeman
       output do
         field :id, _("Id")
         field :name, _("Name")
-        field :label, _("Label")
+        field :title, _("Title")
         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
 
       build_options
@@ -64,6 +70,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.puppetclasses(self)
         HammerCLIForeman::References.parameters(self)
         HammerCLIForeman::References.taxonomies(self)
+        field :ancestry, _("Parent Id")
       end
 
       build_options

data/lib/hammer_cli_foreman/i18n.rb

@@ -24,6 +24,10 @@ module HammerCLIForeman
         '/usr/share/locale'
       end
 
+      def domain_name
+        "#{super}@system"
+      end
+
     end
 
   end

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -10,6 +10,10 @@ module HammerCLIForeman
 
     attr_reader :name, :description
 
+    def plural_name
+      ApipieBindings::Inflector.pluralize(@name)
+    end
+
     def editable?
       @editable
     end
@@ -37,12 +41,12 @@ module HammerCLIForeman
       :filter =>           [],
       :host =>             [ s_name(_("Host name")) ],
       :hostgroup =>        [ s_name(_("Hostgroup name")) ],
-      :image =>            [],
+      # :image =>            [],
       :location =>         [ s_name(_("Location name")) ],
       :medium =>           [ s_name(_("Medium name")) ],
       :model =>            [ s_name(_("Model name")) ],
       :organization =>     [ s_name(_("Organization name")) ],
-      :operatingsystem =>  [],
+      :operatingsystem =>  [ s("title", _("Operating system title"), :editable => false) ],
       :ptable =>           [ s_name(_("Partition table name")) ],
       :proxy =>            [ s_name(_("Proxy name")) ],
       :puppetclass =>      [ s_name(_("Puppet class name")) ],
@@ -81,6 +85,7 @@ module HammerCLIForeman
       return scoped_options unless resource
 
       option_names = searchables(resource).map { |s| s.name }
+      option_names += searchables(resource).map { |s| s.plural_name }
       option_names << "id"
 
       option_names.each do |name|
@@ -98,15 +103,35 @@ module HammerCLIForeman
     end
 
 
+    def puppetclass_id(options)
+      if options[HammerCLI.option_accessor_name("id")]
+        return options[HammerCLI.option_accessor_name("id")]
+      else
+        resource = @api.resource(:puppetclasses)
+        results = resolved_call(:puppetclasses, :index, options)[0]
+        results = results.values.flatten
+        return pick_result(results, resource)['id']
+      end
+    end
+
+    def puppetclass_ids(options)
+      options[HammerCLI.option_accessor_name("ids")] || find_resources(:puppetclasses, options).collect{|h| h.values}.flatten.map{|h| h['id']}
+    end
+
     protected
 
     def define_id_finders
       @api.resources.each do |resource|
         method_name = "#{resource.singular_name}_id"
+        plural_method_name = "#{resource.singular_name}_ids"
 
         self.class.send(:define_method, method_name) do |options|
           get_id(resource.name, options)
         end unless respond_to?(method_name)
+
+        self.class.send(:define_method, plural_method_name) do |options|
+          get_ids(resource.name, options)
+        end unless respond_to?(plural_method_name)
       end
     end
 
@@ -114,31 +139,57 @@ module HammerCLIForeman
       options[HammerCLI.option_accessor_name("id")] || find_resource(resource_name, options)['id']
     end
 
+    def get_ids(resource_name, options)
+      options[HammerCLI.option_accessor_name("ids")] || find_resources(resource_name, options).map{|r| r['id']}
+    end
+
+    def find_resources(resource_name, options)
+      resource = @api.resource(resource_name)
+      results = resolved_call(resource_name, :index, options)
+      raise ResolverError.new(_("one of %s not found") % resource.name, resource) if results.count < expected_record_count(options, resource)
+      results
+    end
+
     def find_resource(resource_name, options)
       resource = @api.resource(resource_name)
+      results = resolved_call(resource_name, :index, options)
+      pick_result(results, resource)
+    end
+
+    def resolved_call(resource_name, action_name, options)
+      resource = @api.resource(resource_name)
+      action = resource.action(action_name)
 
       search_options = search_options(options, resource)
-      IdParamsFilter.new(:only_required => true).for_action(resource.action(:index)).each do |param|
+      IdParamsFilter.new(:only_required => true).for_action(action).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|
+      search_options = route_options(options, action).merge(search_options)
+
+      results = resource.call(action_name, search_options)
+      results = HammerCLIForeman.collection_to_common_format(results)
+      results
+    end
+
+    def route_options(options, action)
+      return {} if action.routes.any? { |r| r.params_in_path.empty? }
+
+      route_options = {}
+
+      action.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]
+            route_options[param] ||= options[key]
           end
         end
       end
-
-      results = resource.call(:index, search_options)
-      results = HammerCLIForeman.collection_to_common_format(results)
-
-      pick_result(results, resource)
+      route_options
     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
+      raise ResolverError.new(_("%s not found") % resource.singular_name, resource) if results.empty?
+      raise ResolverError.new(_("%s found more than once") % resource.singular_name, resource) if results.count > 1
       results[0]
     end
 
@@ -149,7 +200,7 @@ module HammerCLIForeman
                        else
                          create_search_options(options, resource)
                        end
-      raise MissingSeachOptions.new(_("Missing options to search %s") % resource.singular_name) if search_options.empty?
+      raise MissingSeachOptions.new(_("Missing options to search %s") % resource.singular_name, resource) if search_options.empty?
       search_options
     end
 
@@ -157,11 +208,28 @@ module HammerCLIForeman
       @searchables.for(resource)
     end
 
+    def expected_record_count(options, resource)
+      searchables(resource).each do |s|
+        value = options[HammerCLI.option_accessor_name(s.name.to_s)]
+        values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
+        if value
+          return 1
+        elsif values
+          return values.count
+        end
+      end
+      0
+    end
+
     def create_search_options(options, resource)
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]
+        values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
         if value
           return {:search => "#{s.name} = \"#{value}\""}
+        elsif values
+          query = values.map{|v| "#{s.name} = \"#{v}\"" }.join(" or ")
+          return {:search => query}
         end
       end
       {}

data/lib/hammer_cli_foreman/operating_system.rb

@@ -8,7 +8,7 @@ module HammerCLIForeman
 
       output do
         field :id, _("Id")
-        field :fullname, _("Full name")
+        field :title, _("Title")
         field :release_name, _("Release name")
         field :family, _("Family")
       end
@@ -41,56 +41,17 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-
-      #FIXME: replace with build_options when they are added to the api docs
-      option "--architecture-ids", "ARCH_IDS", _("set associated architectures"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--config-template-ids", "CONFIG_TPL_IDS", _("set associated templates"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--medium-ids", "MEDIUM_IDS", _("set associated installation media"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--ptable-ids", "PTABLE_IDS", _("set associated partition tables"),
-        :format => HammerCLI::Options::Normalizers::List.new
-
       success_message _("Operating system created")
       failure_message _("Could not create the operating system")
 
-      def request_params
-        params = super
-        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
-
       build_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      #FIXME: replace with build_options when they are added to the api docs
-      option "--architecture-ids", "ARCH_IDS", _("set associated architectures"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--config-template-ids", "CONFIG_TPL_IDS", _("set associated templates"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--medium-ids", "MEDIUM_IDS", _("set associated installation media"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      option "--ptable-ids", "PTABLE_IDS", _("set associated partition tables"),
-        :format => HammerCLI::Options::Normalizers::List.new
-
       success_message _("Operating system updated")
       failure_message _("Could not update the operating system")
 
-      def request_params
-        params = super
-        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
-
       build_options
     end
 
@@ -112,7 +73,7 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:option_operatingsystem_id).required
+        validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
       build_options
@@ -126,7 +87,7 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:option_operatingsystem_id).required
+        validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
       build_options
@@ -137,7 +98,7 @@ module HammerCLIForeman
       command_name "set-default-template"
       resource :os_default_templates
 
-      option "--id", "OS ID", _("operatingsystem id"), :required => true
+      option "--id", "OS ID", _("operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
       option "--config-template-id", "TPL ID", _("config template id to be set"), :required => true
 
 
@@ -203,7 +164,7 @@ module HammerCLIForeman
       command_name "delete-default-template"
       resource :os_default_templates
 
-      option "--id", "OS ID", _("operatingsystem id"), :required => true
+      option "--id", "OS ID", _("operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
       option "--type", "TPL TYPE", _("Type of the config template"), :required => true
 
       success_message _("Default template deleted")

data/lib/hammer_cli_foreman/option_builders.rb

@@ -81,6 +81,11 @@ module HammerCLIForeman
         builders << DependentSearchablesOptionBuilder.new(dep_resource, @searchables)
       end
 
+      IdArrayParamsFilter.new(:only_required => false).for_action(action).each do |p|
+        resource = HammerCLIForeman.param_to_resource(p.name)
+        builders << DependentSearchablesArrayOptionBuilder.new(resource, @searchables) unless resource.nil?
+      end
+
       builders
     end
 
@@ -145,6 +150,10 @@ module HammerCLIForeman
 
     protected
 
+    def option(*args)
+      HammerCLI::Apipie::OptionDefinition.new(*args)
+    end
+
     def description(param_name, action_name)
       return " " unless @resource.has_action? action_name
 
@@ -172,7 +181,8 @@ module HammerCLIForeman
         option(
           optionamize("--#{s.name}"),
           s.name.upcase,
-          s.description
+          s.description,
+          :referenced_resource => @resource.singular_name
         )
       end
     end
@@ -211,7 +221,8 @@ module HammerCLIForeman
           optionamize("--#{aliased_name}"),
           "#{aliased_name}_#{first.name}".upcase,
           first.description || " ",
-          :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{first.name}")
+          :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{first.name}"),
+          :referenced_resource => resource.singular_name
         )
 
         # Other options are named by the resource plus the searchable name
@@ -221,7 +232,8 @@ module HammerCLIForeman
             optionamize("--#{aliased_name}-#{s.name}"),
             "#{aliased_name}_#{s.name}".upcase,
             s.description || " ",
-            :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{s.name}")
+            :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{s.name}"),
+            :referenced_resource => resource.singular_name
           )
         end
       end
@@ -230,7 +242,8 @@ module HammerCLIForeman
         optionamize("--#{aliased_name}-id"),
         "#{aliased_name}_id".upcase,
         description("id", :show),
-        :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_id")
+        :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_id"),
+        :referenced_resource => resource.singular_name
       )
       options
     end
@@ -241,6 +254,52 @@ module HammerCLIForeman
 
   end
 
+
+
+  class DependentSearchablesArrayOptionBuilder < DependentSearchablesOptionBuilder
+
+
+    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)
+      aliased_plural_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. --organizations with accessor option_organization_names
+        options << option(
+          optionamize("--#{aliased_plural_name}"),
+          "#{aliased_name}_#{first.plural_name}".upcase,
+          " ",
+          :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{first.plural_name}"),
+          :format => HammerCLI::Options::Normalizers::List.new,
+          :referenced_resource => resource.singular_name
+        )
+
+        # Other options are named by the resource plus the searchable name
+        # Eg. --organization-labels with accessor option_organization_labels
+        remaining.each do |s|
+          options << option(
+            optionamize("--#{aliased_name}-#{s.plural_name}"),
+            "#{aliased_name}_#{s.plural_name}".upcase,
+            " ",
+            :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{s.plural_name}"),
+            :format => HammerCLI::Options::Normalizers::List.new,
+            :referenced_resource => resource.singular_name
+          )
+        end
+      end
+
+      options
+    end
+  end
+
   class SearchablesUpdateOptionBuilder < SearchablesAbstractOptionBuilder
 
     def initialize(resource, searchables)
@@ -276,7 +335,7 @@ module HammerCLIForeman
 
     def build(builder_params={})
       [
-        option("--id", "ID", description("id", :show))
+        option("--id", "ID", description("id", :show), :referenced_resource => @resource.singular_name)
       ]
     end