hammer_cli_foreman 0.1.4 → 0.2.0

data/lib/hammer_cli_foreman/environment.rb

@@ -54,8 +54,7 @@ module HammerCLIForeman
     end
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-      parent_resource :environments
-      build_options
+      build_options_for :environments
     end
 
 

data/lib/hammer_cli_foreman/host.rb

@@ -1,6 +1,9 @@
+require 'hammer_cli_foreman/fact'
 require 'hammer_cli_foreman/report'
 require 'hammer_cli_foreman/puppet_class'
 require 'hammer_cli_foreman/smart_class_parameter'
+require 'hammer_cli_foreman/smart_variable'
+require 'hammer_cli_foreman/interface'
 
 require 'highline/import'
 
@@ -52,7 +55,7 @@ module HammerCLIForeman
             :provision_method, :capabilities, :flavour_ref, :image_ref, :start,
             :network, :cpus, :memory, :provider, :type, :tenant_id, :image_id,
             # ----------------------------------------------------------------------------------
-            :puppet_class_ids, :host_parameters_attributes]
+            :puppet_class_ids, :host_parameters_attributes, :interfaces_attributes]
     end
 
     def self.ask_password
@@ -62,29 +65,37 @@ module HammerCLIForeman
 
     def request_params
       params = super
-      params['host']['owner_id'] ||= get_resource_id(HammerCLIForeman.foreman_resource(:users), :required => false, :scoped => true)
-      params['host']['puppet_proxy_id'] ||= proxy_id(option_puppet_proxy)
-      params['host']['puppet_ca_proxy_id'] ||= proxy_id(option_puppet_ca_proxy)
-      params['host']['puppetclass_ids'] = option_puppetclass_ids || puppet_class_ids(option_puppet_classes)
+
+      owner_id = get_resource_id(HammerCLIForeman.foreman_resource(:users), :required => false, :scoped => true)
+      params['host']['owner_id'] ||= owner_id unless owner_id.nil?
+
+      puppet_proxy_id = proxy_id(option_puppet_proxy)
+      params['host']['puppet_proxy_id'] ||= puppet_proxy_id unless puppet_proxy_id.nil?
+
+      puppet_ca_proxy_id = proxy_id(option_puppet_ca_proxy)
+      params['host']['puppet_ca_proxy_id'] ||= puppet_ca_proxy_id unless puppet_ca_proxy_id.nil?
+
+      puppetclass_ids = option_puppetclass_ids || puppet_class_ids(option_puppet_classes)
+      params['host']['puppetclass_ids'] = puppetclass_ids unless puppetclass_ids.nil?
 
       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']['host_parameters_attributes'] = parameter_attributes
       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(option_interface_list)
-      end
+      params['host']['interfaces_attributes'] = interfaces_attributes
+
+      # check primary and provision interfaces, only for create
+      check_mandatory_interfaces(params['host']['interfaces_attributes']) if params['id'].nil?
 
       params['host']['root_pass'] = option_root_password unless option_root_password.nil?
 
       if option_ask_root_password
         params['host']['root_pass'] = HammerCLIForeman::CommonHostUpdateOptions::ask_password
       end
+
       params
     end
 
@@ -115,6 +126,30 @@ module HammerCLIForeman
       nested_hash
     end
 
+    def interfaces_attributes
+      # move each attribute starting with "compute_" to compute_attributes
+      nic_list = option_interface_list.collect do |nic|
+        compute_attributes = {}
+        nic.keys.each do |key|
+          if key.start_with? 'compute_'
+            compute_attributes[key.gsub('compute_', '')] = nic.delete(key)
+          end
+        end
+        nic['compute_attributes'] = compute_attributes unless compute_attributes.empty?
+        nic
+      end
+      nested_attributes(nic_list)
+    end
+
+    def check_mandatory_interfaces(nics)
+      unless nics.any? { |key, nic| nic['primary'] == 'true' }
+        signal_usage_error _('At least one interface must be set as primary')
+      end
+      unless nics.any? { |key, nic| nic['provision'] == 'true' }
+        signal_usage_error _('At least one interface must be set as provision')
+      end
+    end
+
   end
 
 
@@ -140,15 +175,18 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       def extend_data(host)
+        host['compute_resource_name'] ||= _('Bare Metal')
+        host['image_file'] = nil if host['image_file'].empty?
+        host['interfaces'] = host['interfaces'].map do |nic|
+          nic['_type'] = HammerCLIForeman::Interface.format_type(nic)
+          nic
+        end if host['interfaces']
+
         # FIXME: temporary fetching parameters until the api gets fixed.
         # Noramlly they should come in the host's json.
         # http://projects.theforeman.org/issues/5820
-        host["parameters"] = get_parameters(host["id"])
+        host['parameters'] = get_parameters(host["id"])
 
-        host["_bmc_interfaces"] =
-          host["interfaces"].select{|intfs| intfs["type"] == "Nic::BMC" } rescue []
-        host["_managed_interfaces"] =
-          host["interfaces"].select{|intfs| intfs["type"] == "Nic::Managed" } rescue []
         host
       end
 
@@ -157,70 +195,73 @@ module HammerCLIForeman
         HammerCLIForeman.collection_to_common_format(params)
       end
 
-      output ListCommand.output_definition do
-        field :uuid, _("UUID")
-        field :certname, _("Cert name")
 
+      output do
+        field :id, _("Id")
+        field :uuid, _("UUID"), Fields::Field, :hide_blank => true
+        field :name, _("Name")
+        field nil, _("Organization"), Fields::SingleReference, :key => :organization, :hide_blank => true
+        field nil, _("Location"), Fields::SingleReference, :key => :location, :hide_blank => true
+        field nil, _("Host Group"), Fields::SingleReference, :key => :hostgroup
+        field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
+        field nil, _("Compute Profile"), Fields::SingleReference, :key => :compute_profile, :hide_blank => true
         field nil, _("Environment"), Fields::SingleReference, :key => :environment
-
-        field :managed, _("Managed")
-        field :enabled, _("Enabled")
-        field :build, _("Build")
-
-        field :use_image, _("Use image")
-        field :disk, _("Disk")
-        field :image_file, _("Image file")
-
-        field :sp_name, _("SP Name")
-        field :sp_ip, _("SP IP")
-        field :sp_mac, _("SP MAC")
-
-        field nil, _("SP Subnet"), Fields::SingleReference, :key => :sp_subnet
+        field :puppet_ca_proxy_id, _("Puppet CA Id")
+        field :puppet_proxy_id, _("Puppet Master Id")
+        field :certname, _("Cert name")
+        field :managed, _("Managed"), Fields::Boolean
 
         field :installed_at, _("Installed at"), Fields::Date
         field :last_report, _("Last report"), Fields::Date
 
-        field :puppet_ca_proxy_id, _("Puppet CA Proxy Id")
-        field nil, _("Medium"), Fields::SingleReference, :key => :medium
-        field nil, _("Model"), Fields::SingleReference, :key => :model
-        field :owner_id, _("Owner Id")
-        field nil, _("Subnet"), Fields::SingleReference, :key => :subnet
-        field nil, _("Domain"), Fields::SingleReference, :key => :domain
-        field :puppet_proxy_id, _("Puppet Proxy Id")
-        field :owner_type, _("Owner Type")
-        field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
-        field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
-        field nil, _("Image"), Fields::SingleReference, :key => :image
-        field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
-
-        field :comment, _("Comment")
-
-        collection :_bmc_interfaces, _("BMC Network Interfaces"), :hide_blank => true do
-          field :id, _("Id")
-          field :name, _("Name")
+        label _("Network") do
           field :ip, _("IP")
           field :mac, _("MAC")
-          field :domain_id, _("Domain Id")
-          field :domain_name, _("Domain Name")
-          field :subnet_id, _("Subnet Id")
-          field :subnet_name, _("Subnet Name")
-          field :username, _("BMC Username")
-          field :password, _("BMC Password")
+          field nil, _("Subnet"), Fields::SingleReference, :key => :subnet
+          field nil, _("Domain"), Fields::SingleReference, :key => :domain
+          field nil, _("Service provider"), Fields::Label, :hide_blank => true do
+            field :sp_name, _("SP Name"), Fields::Field, :hide_blank => true
+            field :sp_ip, _("SP IP"), Fields::Field, :hide_blank => true
+            field :sp_mac, _("SP MAC"), Fields::Field, :hide_blank => true
+            field nil, _("SP Subnet"), Fields::SingleReference, :key => :sp_subnet, :hide_blank => true
+          end
         end
 
-        collection :_managed_interfaces, _("Managed Network Interfaces"), :hide_blank => true do
-          field :id, _("Id")
-          field :name, _("Name")
-          field :ip, _("IP")
-          field :mac, _("MAC")
-          field :domain_id, _("Domain Id")
-          field :domain_name, _("Domain Name")
-          field :subnet_id, _("Subnet Id")
-          field :subnet_name, _("Subnet Name")
+        collection :interfaces, _("Network interfaces") do
+          field :id, _('Id')
+          field :identifier, _('Identifier')
+          field :_type, _('Type')
+          field :mac, _('MAC address')
+          field :ip, _('IP address')
+          field :fqdn, _('FQDN')
+        end
+
+        label _("Operating system") do
+          field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
+          field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
+          # provision_method
+          # for network based
+          field :build, _("Build"), Fields::Boolean
+          field nil, _("Medium"), Fields::SingleReference, :key => :medium
+          field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
+          field :disk, _("Custom partition table"), Fields::LongText
+          # image
+          # for image based
+          field nil, _("Image"), Fields::SingleReference, :key => :image, :hide_blank => true
+          field :image_file, _("Image file"), Fields::Field, :hide_blank => true
+          field :use_image, _("Use image"), Fields::Boolean, :hide_blank => true
         end
 
         HammerCLIForeman::References.parameters(self)
-        HammerCLIForeman::References.timestamps(self)
+
+        # additional info
+        label _("Additional info") do
+          field :owner_id, _("Owner Id")
+          field :owner_type, _("Owner Type")
+          field :enabled, _("Enabled"), Fields::Boolean
+          field nil, _("Model"), Fields::SingleReference, :key => :model, :hide_blank => true
+          field :comment, _("Comment"), Fields::LongText
+        end
       end
 
       build_options
@@ -294,10 +335,9 @@ module HammerCLIForeman
     end
 
 
-    class PuppetClassesCommand < HammerCLIForeman::AssociatedResourceListCommand
+    class PuppetClassesCommand < HammerCLIForeman::ListCommand
       command_name "puppet-classes"
-      resource :puppetclasses, :index
-      parent_resource :hosts
+      resource :puppetclasses
 
       output HammerCLIForeman::PuppetClass::ListCommand.output_definition
 
@@ -305,7 +345,10 @@ module HammerCLIForeman
         HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(super)
       end
 
-      build_options :without => [:host_id, :hostgroup_id, :environment_id]
+      build_options do |o|
+        o.without(:hostgroup_id, :environment_id)
+        o.expand.only(:hosts)
+      end
     end
 
 
@@ -462,11 +505,26 @@ module HammerCLIForeman
     end
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-      parent_resource :hosts
-      build_options
+      build_options_for :hosts
+
+      def validate_options
+        super
+        validator.any(:option_host_name, :option_host_id).required
+      end
+    end
+
+    class SmartVariablesCommand < HammerCLIForeman::SmartVariablesList
+      build_options_for :hosts
+
+      def validate_options
+        super
+        validator.any(:option_host_name, :option_host_id).required
+      end
     end
 
     autoload_subcommands
+
+    subcommand 'interface', HammerCLIForeman::Interface.desc, HammerCLIForeman::Interface
   end
 
 end

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_foreman/smart_class_parameter'
+require 'hammer_cli_foreman/smart_variable'
 require 'hammer_cli_foreman/puppet_class'
 
 module HammerCLIForeman
@@ -115,13 +116,10 @@ module HammerCLIForeman
         HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(super)
       end
 
-      def request_params
-        params = super
-        params['hostgroup_id'] = get_identifier
-        params
+      build_options do |o|
+        o.without(:host_id, :environment_id)
+        o.expand.only(:hostgroups)
       end
-
-      build_options
     end
 
 
@@ -145,10 +143,22 @@ module HammerCLIForeman
     end
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-      parent_resource :hostgroups
-      build_options
+      build_options_for :hostgroups
+
+      def validate_options
+        super
+        validator.any(:option_hostgroup_name, :option_hostgroup_id).required
+      end
     end
 
+    class SmartVariablesCommand < HammerCLIForeman::SmartVariablesList
+      build_options_for :hostgroups
+
+      def validate_options
+        super
+        validator.any(:option_hostgroup_name, :option_hostgroup_id).required
+      end
+    end
 
     autoload_subcommands
   end

data/lib/hammer_cli_foreman/i18n.rb

@@ -24,14 +24,10 @@ module HammerCLIForeman
         '/usr/share/locale'
       end
 
-      def domain_name
-        "#{super}@system"
-      end
-
     end
 
   end
 end
 
-HammerCLI::I18n.add_domain(HammerCLIForeman::I18n::LocaleDomain.new)
-HammerCLI::I18n.add_domain(HammerCLIForeman::I18n::SystemLocaleDomain.new)
+domain = [HammerCLIForeman::I18n::LocaleDomain.new, HammerCLIForeman::I18n::SystemLocaleDomain.new].find { |d| d.available? }
+HammerCLI::I18n.add_domain(domain) if domain

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -40,23 +40,27 @@ module HammerCLIForeman
       :fact_value =>       [],
       :filter =>           [],
       :host =>             [ s_name(_("Host name")) ],
-      :hostgroup =>        [ s_name(_("Hostgroup name")) ],
+      :hostgroup =>        [ s_name(_("Hostgroup name")), s("title", _("Hostgroup title"),:editable => false) ],
       # :image =>            [],
+      :interface =>        [],
       :location =>         [ s_name(_("Location name")) ],
       :medium =>           [ s_name(_("Medium name")) ],
       :model =>            [ s_name(_("Model name")) ],
       :organization =>     [ s_name(_("Organization name")) ],
       :operatingsystem =>  [ s("title", _("Operating system title"), :editable => false) ],
+      :override_value =>   [],
       :ptable =>           [ s_name(_("Partition table name")) ],
       :proxy =>            [ s_name(_("Proxy name")) ],
       :puppetclass =>      [ s_name(_("Puppet class name")) ],
       :report =>           [ s_name(_("Report name")) ],
       :role =>             [ s_name(_("User role name")) ],
+      :setting =>          [ s_name(_("Setting name"), :editable => false) ],
       :subnet =>           [ s_name(_("Subnet name")) ],
       :template =>         [],
       :user =>             [ s("login", _("User's login to search by")) ],
       :common_parameter =>      [ s_name(_("Common parameter name")) ],
-      :smart_class_parameter => [ s_name(_("Smart class parameter name")) ]
+      :smart_class_parameter => [ s_name(_("Smart class parameter name")) ],
+      :smart_variable => [ s_name(_("Smart variable name")) ]
     }
     DEFAULT_SEARCHABLES = [ s_name(_("Name to search by")) ]
 
@@ -127,11 +131,11 @@ module HammerCLIForeman
 
         self.class.send(:define_method, method_name) do |options|
           get_id(resource.name, options)
-        end unless respond_to?(method_name)
+        end unless respond_to?(method_name, true)
 
         self.class.send(:define_method, plural_method_name) do |options|
           get_ids(resource.name, options)
-        end unless respond_to?(plural_method_name)
+        end unless respond_to?(plural_method_name, true)
       end
     end
 
@@ -151,11 +155,16 @@ module HammerCLIForeman
     end
 
     def find_resource(resource_name, options)
+      results = find_resource_raw(resource_name, options)
       resource = @api.resource(resource_name)
-      results = resolved_call(resource_name, :index, options)
       pick_result(results, resource)
     end
 
+    def find_resource_raw(resource_name, options)
+      resolved_call(resource_name, :index, options)
+    end
+
+
     def resolved_call(resource_name, action_name, options)
       resource = @api.resource(resource_name)
       action = resource.action(action_name)
@@ -195,7 +204,7 @@ module HammerCLIForeman
 
     def search_options(options, resource)
       method = "create_#{resource.name}_search_options"
-      search_options = if respond_to?(method)
+      search_options = if respond_to?(method, true)
                          send(method, options)
                        else
                          create_search_options(options, resource)
@@ -221,6 +230,32 @@ module HammerCLIForeman
       0
     end
 
+    # puppet class search results are in non-standard format
+    # and needs to be un-hashed first
+    def puppetclass_id(options)
+      return options[HammerCLI.option_accessor_name("id")] if options[HammerCLI.option_accessor_name("id")]
+      resource = @api.resource(:puppetclasses)
+      results = find_resource_raw(:puppetclasses, options)
+      require('hammer_cli_foreman/puppet_class')
+      results = HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(results)
+      pick_result(results, resource)['id']
+    end
+
+    def create_smart_class_parameters_search_options(options)
+      search_options = {}
+      value = options[HammerCLI.option_accessor_name('name')]
+      search_options[:search] = "key = \"#{value}\""
+      search_options[:puppetclass_id] = puppetclass_id(scoped_options("puppetclass", options))
+      search_options
+    end
+
+    def create_smart_variables_search_options(options)
+      search_options = {}
+      value = options[HammerCLI.option_accessor_name('name')]
+      search_options[:search] = "key = \"#{value}\""
+      search_options
+    end
+
     def create_search_options(options, resource)
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]