hammer_cli_foreman_discovery 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e13bbfa0e59e0b9fe2706ef3adb1773bb138d714
-  data.tar.gz: 6b35b71861d67d2a8b888481bea73433d8429806
+SHA256:
+  metadata.gz: 1fa956f4e49d7c7f08a0247b19cc7d46d94d846619414fc5eb17d4cd14ac17b2
+  data.tar.gz: af290183d21f293438b5cbc26cb73b0dcac8ea158ba299d317bcfeffffb2f762
 SHA512:
-  metadata.gz: 52e9d9d328eb8bdb6808b2c4a87a1802a84b6afb6e80eadd6a9eba4c913e6cf376079f16390b86e1526fd66e70979dbc380d47438260f3949dc39dd50b1b8a64
-  data.tar.gz: 74c02e4bdef7b46ad99b4cf8e959a21c0659781b83102cd3fabab27731a2e950efe5d69733873f319fdfff325fcf1ca72f45e7220446363f34da048ff4a39a2f
+  metadata.gz: 4b54eccacc899401a60536779b497c45ccfda5c00b294fd299524582d785dd25a4ab236bb700819e067cd6857a324214975a0b2a45f55646999f6046160af442
+  data.tar.gz: 0da72b2913c96166c17f278730a74e0b1b6e16ff97004bd8bd65610abce9ba6fa9b8e07cccba51289507dbc7a44e9a442366184dc2b66916c50278203d45bed2

data/lib/hammer_cli_foreman_discovery/command_extensions/provision_with_puppet.rb

@@ -0,0 +1,75 @@
+module HammerCLIForemanDiscovery
+  module CommandExtensions
+    class ProvisionWithPuppet < HammerCLI::CommandExtensions
+      option_family(
+        format: HammerCLI::Options::Normalizers::List.new,
+        aliased_resource: 'puppet-class',
+        description: 'Names/Ids of associated Puppet classes'
+      ) do
+        parent '--puppet-class-ids', 'PUPPET_CLASS_IDS', _('List of Puppet class ids'),
+               attribute_name: :option_puppetclass_ids
+        child '--puppet-classes', 'PUPPET_CLASS_NAMES', '',
+              attribute_name: :option_puppetclass_names
+      end
+
+      # TODO: Until the API is cleaned up
+      option_family(
+        aliased_resource: 'environment',
+        description: _('Puppet environment. Required if host is managed and value is not inherited from host group'),
+        deprecation: _("Use %s instead") % '--puppet-environment[-id]',
+        deprecated: { '--environment' => _("Use %s instead") % '--puppet-environment[-id]',
+                      '--environment-id' => _("Use %s instead") % '--puppet-environment[-id]'}
+      ) do
+        parent '--environment-id', 'ENVIRONMENT_ID', _(''),
+               format: HammerCLI::Options::Normalizers::Number.new,
+               attribute_name: :option_environment_id
+        child '--environment', 'ENVIRONMENT_NAME', _('Environment name'),
+              attribute_name: :option_environment_name
+      end
+
+      option_family(
+        aliased_resource: 'puppet_proxy'
+      ) do
+        parent '--puppet-proxy-id', 'PUPPET_PROXY_ID', _(''),
+               format: HammerCLI::Options::Normalizers::Number.new,
+               attribute_name: :option_puppet_proxy_id
+
+      end
+      option_family(
+        aliased_resource: 'puppet_ca_proxy'
+      ) do
+        parent '--puppet-ca-proxy-id', 'PUPPET_CA_PROXY_ID', _(''),
+               format: HammerCLI::Options::Normalizers::Number.new,
+               attribute_name: :option_puppet_ca_proxy_id
+
+      end
+
+      request_params do |params, command_object|
+        if command_object.option_puppet_proxy
+          params['discovered_host']['puppet_proxy_id'] ||= HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.proxy_id(
+            command_object.resolver, command_object.option_puppet_proxy
+          )
+        end
+        if command_object.option_puppet_ca_proxy
+          params['discovered_host']['puppet_ca_proxy_id'] ||= HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.proxy_id(
+            command_object.resolver, command_object.option_puppet_ca_proxy
+          )
+        end
+        if command_object.option_puppetclass_ids
+          params['discovered_host']['puppet_attributes'] ||= {}
+          params['discovered_host']['puppet_attributes']['puppetclass_ids'] ||= command_object.option_puppetclass_ids
+        end
+        if command_object.option_puppetclass_names
+          params['discovered_host']['puppet_attributes'] ||= {}
+          params['discovered_host']['puppet_attributes']['puppetclass_ids'] ||= command_object.resolver.puppetclass_ids(
+            'option_names' => command_object.option_puppetclass_names
+          )
+        end
+        if params['discovered_host']['environment_id']
+          params['discovered_host']['puppet_attributes'] ||= {}
+          params['discovered_host']['puppet_attributes']['environment_id'] = params['discovered_host'].delete('environment_id')
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman_discovery/discovery.rb

@@ -75,33 +75,25 @@ module HammerCLIForemanDiscovery
       success_message _("Host created")
       failure_message _("Could not create the host")
 
-      def self.build_options
-        option "--partition-table-id", "PARTITION_TABLE_ID", " "
-        option "--root-password", "ROOT_PW", " "
-        option "--ask-root-password", "ASK_ROOT_PW", " ",
-                    :format => HammerCLI::Options::Normalizers::Bool.new
-        option "--puppetclass-ids", "PUPPETCLASS_IDS", " ",
-                    :format => HammerCLI::Options::Normalizers::List.new
-
-        bool_format           = {}
-        bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
-        option "--managed", "MANAGED", " ", bool_format
-        bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
-        option "--build", "BUILD", " ", bool_format
-        bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
-        option "--enabled", "ENABLED", " ", bool_format
-        bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
-        option "--overwrite", "OVERWRITE", " ", bool_format
-
-        option "--parameters", "PARAMS", _("Host parameters"),
-                    :format => HammerCLI::Options::Normalizers::KeyValueList.new
-        option "--interface", "INTERFACE", _("Interface parameters"), :multivalued => true,
-                    :format => HammerCLI::Options::Normalizers::KeyValueList.new
-        option "--provision-method", "METHOD", " ",
-                    :format => HammerCLI::Options::Normalizers::Enum.new(['build', 'image'])
-
-        super :without => [:root_pass, :ptable_id, :puppet_class_ids]
-      end
+      option "--root-password", "ROOT_PW", " "
+      option "--ask-root-password", "ASK_ROOT_PW", " ",
+                  :format => HammerCLI::Options::Normalizers::Bool.new
+      bool_format           = {}
+      bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
+      option "--managed", "MANAGED", " ", bool_format
+      bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
+      option "--build", "BUILD", " ", bool_format
+      bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
+      option "--enabled", "ENABLED", " ", bool_format
+      bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
+      option "--overwrite", "OVERWRITE", " ", bool_format
+
+      option "--parameters", "PARAMS", _("Host parameters"),
+                  :format => HammerCLI::Options::Normalizers::KeyValueList.new
+      option "--interface", "INTERFACE", _("Interface parameters"), :multivalued => true,
+                  :format => HammerCLI::Options::Normalizers::KeyValueList.new
+      option "--provision-method", "METHOD", " ",
+                  :format => HammerCLI::Options::Normalizers::Enum.new(['build', 'image'])
 
       def ask_password
         prompt = _("Enter the root password for the host:") + '_'
@@ -111,7 +103,8 @@ module HammerCLIForemanDiscovery
       def request_params
         params = super
 
-        params['discovered_host']['ptable_id'] = option_partition_table_id unless option_partition_table_id.nil?
+        params['discovered_host']['host_parameters_attributes'] = parameter_attributes
+        params['discovered_host']['ptable_id'] = option_ptable_id unless option_ptable_id.nil?
         params['discovered_host']['root_pass'] = option_root_password unless option_root_password.nil?
         params['discovered_host']['overwrite'] = option_overwrite unless option_overwrite.nil?
 
@@ -122,13 +115,52 @@ module HammerCLIForemanDiscovery
         params
       end
 
-      build_options
+      def parameter_attributes
+        return {} unless option_parameters
+        option_parameters.collect do |key, value|
+          if value.is_a? String
+            {"name"=>key, "value"=>value}
+          else
+            {"name"=>key, "value"=>value.inspect}
+          end
+        end
+      end
+
+      build_options without: %i[
+        root_pass ptable_id host_parameters_attributes
+        puppet_class_ids environment_id puppet_proxy_id puppet_ca_proxy_id
+      ] do |o|
+        # TODO: Until the API is cleaned up
+        o.expand.except(:environments)
+      end
+
+      if defined?(HammerCLIForemanPuppet)
+        require 'hammer_cli_foreman_discovery/command_extensions/provision_with_puppet'
+        extend_with(HammerCLIForemanDiscovery::CommandExtensions::ProvisionWithPuppet.new)
+        require 'hammer_cli_foreman_puppet/command_extensions/environment'
+        require 'hammer_cli_foreman_puppet/command_extensions/host'
+        extend_with(HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new)
+        extend_with(HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.new(only: :option_family))
+      end
     end
 
     class AutoProvisionCommand < HammerCLIForeman::SingleResourceCommand
       action :auto_provision
       command_name "auto-provision"
       desc _("Auto provision a host")
+
+      option '--all', :flag, _("Auto provision all discovered hosts")
+
+      def execute
+        if option_all?
+          resource.call(:auto_provision_all, {})
+          print_message _("Hosts created")
+          HammerCLI::EX_OK
+        else
+          super
+        end
+      end
+
       success_message _("Host created")
       failure_message _("Could not create the host")
 
@@ -139,6 +171,26 @@ module HammerCLIForemanDiscovery
       action :reboot
       command_name "reboot"
       desc _("Reboot a host")
+
+      option '--all', :flag, _("Reboot all discovered hosts")
+
+      def execute
+        if option_all?
+          begin
+            resource.call(:reboot_all, {})
+            print_message _("Rebooting hosts")
+            HammerCLI::EX_OK
+          rescue RestClient::UnprocessableEntity => error
+            response = JSON.parse(error.response)
+            response = HammerCLIForeman.record_to_common_format(response) unless response.has_key?('message')
+            output.print_error(response['host_details'].map {|i| i['name'] + ": " + i['error'] }.join("\n"))
+            HammerCLI::EX_DATAERR
+          end
+        else
+          super
+        end
+      end
+
       success_message _("Host reboot started")
       failure_message _("Could not reboot the host")
 

data/lib/hammer_cli_foreman_discovery/discovery_rule.rb

@@ -10,7 +10,8 @@ module HammerCLIForemanDiscovery
   module CommonDiscoveryRuleUpdateOptions
 
     def self.included(base)
-      base.option "--hosts-limit", "HOSTS_LIMIT", " ", :attribute_name => :option_max_count
+      base.option "--hosts-limit", "HOSTS_LIMIT", _("Enables to limit maximum amount of provisioned hosts per rule"),
+                  :attribute_name => :option_max_count
       base.build_options :without => :max_count
     end
 
@@ -51,7 +52,6 @@ module HammerCLIForemanDiscovery
       failure_message _("Could not create the rule")
 
       include HammerCLIForemanDiscovery::CommonDiscoveryRuleUpdateOptions
-      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -59,7 +59,6 @@ module HammerCLIForemanDiscovery
       failure_message _("Could not update the rule")
 
       include HammerCLIForemanDiscovery::CommonDiscoveryRuleUpdateOptions
-      build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand

data/lib/hammer_cli_foreman_discovery/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanDiscovery
   def self.version
-    @version ||= Gem::Version.new('1.0.0')
+    @version ||= Gem::Version.new('1.1.0')
   end
 end

data/locale/Makefile

@@ -56,10 +56,10 @@ extract-strings:
 
 reset-po:
 	# merging po files is unnecessary when using transifex.com
-	git checkout -- ../locale/*/*po
+	git checkout -- */$(DOMAIN).po
 
 tx-update: tx-pull extract-strings reset-po $(MOFILES)
 	# amend mo files
-	git add ../locale/*/LC_MESSAGES
+	git add */LC_MESSAGES
 	git commit -a --amend -m "i18n - extracting new, pulling from tx"
-	-echo Changes commited!
+	-echo Changes commited!

data/locale/ca/hammer_cli_foreman_discovery.po

@@ -6,7 +6,7 @@
 # Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-12-09 11:08+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
@@ -33,9 +33,6 @@ msgstr "Nom"
 msgid "MAC"
 msgstr "MAC"
 
-msgid "Last report"
-msgstr "Últim informe"
-
 msgid "CPUs"
 msgstr "Les CPU"
 
@@ -51,7 +48,7 @@ msgstr "Mida de disc"
 msgid "Subnet"
 msgstr "Subxarxa"
 
-msgid "Last Report"
+msgid "Last report"
 msgstr "Últim informe"
 
 msgid "IP"
@@ -96,9 +93,23 @@ msgstr "Introduïu la contrasenya de root per a l'amfitrió:"
 msgid "Auto provision a host"
 msgstr "Auto aprovisiona un amfitrió"
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Hosts created"
+msgstr "S'ha creat l'amfitrió"
+
 msgid "Reboot a host"
 msgstr "Reinicia un amfitrió"
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Rebooting hosts"
+msgstr "Reinicia un amfitrió"
+
 msgid "Host reboot started"
 msgstr "S'ha iniciat el reinici de l'amfitrió"
 

data/locale/de/hammer_cli_foreman_discovery.po

@@ -7,7 +7,7 @@
 # Ettore Atalan <atalanttore@googlemail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-06-18 19:38+0000\n"
 "Last-Translator: Christina Gurski <Gurski_christina@yahoo.de>\n"
@@ -33,9 +33,6 @@ msgstr "Name"
 msgid "MAC"
 msgstr "MAC"
 
-msgid "Last report"
-msgstr "Letzter Bericht"
-
 msgid "CPUs"
 msgstr "CPUs"
 
@@ -51,7 +48,7 @@ msgstr "Festplattengröße"
 msgid "Subnet"
 msgstr "Subnetz"
 
-msgid "Last Report"
+msgid "Last report"
 msgstr "Letzter Bericht"
 
 msgid "IP"
@@ -96,9 +93,23 @@ msgstr "Geben Sie das Root-Passwort für den Host ein:"
 msgid "Auto provision a host"
 msgstr "Host automatisch bereitstellen"
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Hosts created"
+msgstr "Host erstellt"
+
 msgid "Reboot a host"
 msgstr "Host neu starten"
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Rebooting hosts"
+msgstr "Host neu starten"
+
 msgid "Host reboot started"
 msgstr "Host wird neu gestartet"
 

data/locale/en/hammer_cli_foreman_discovery.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-01-21 12:06+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -31,9 +31,6 @@ msgstr ""
 msgid "MAC"
 msgstr ""
 
-msgid "Last report"
-msgstr ""
-
 msgid "CPUs"
 msgstr ""
 
@@ -49,7 +46,7 @@ msgstr ""
 msgid "Subnet"
 msgstr ""
 
-msgid "Last Report"
+msgid "Last report"
 msgstr ""
 
 msgid "IP"
@@ -94,9 +91,21 @@ msgstr ""
 msgid "Auto provision a host"
 msgstr ""
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+msgid "Hosts created"
+msgstr ""
+
 msgid "Reboot a host"
 msgstr ""
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+msgid "Rebooting hosts"
+msgstr ""
+
 msgid "Host reboot started"
 msgstr ""
 

data/locale/en_GB/hammer_cli_foreman_discovery.po

@@ -7,7 +7,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-05-28 23:40+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
@@ -34,9 +34,6 @@ msgstr "Name"
 msgid "MAC"
 msgstr "MAC"
 
-msgid "Last report"
-msgstr "Last report"
-
 msgid "CPUs"
 msgstr "CPUs"
 
@@ -52,8 +49,8 @@ msgstr "Disks size"
 msgid "Subnet"
 msgstr "Subnet"
 
-msgid "Last Report"
-msgstr "Last Report"
+msgid "Last report"
+msgstr "Last report"
 
 msgid "IP"
 msgstr "IP"
@@ -97,9 +94,23 @@ msgstr "Enter the root password for the host:"
 msgid "Auto provision a host"
 msgstr "Auto provision a host"
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Hosts created"
+msgstr "Host created"
+
 msgid "Reboot a host"
 msgstr "Reboot a host"
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Rebooting hosts"
+msgstr "Reboot a host"
+
 msgid "Host reboot started"
 msgstr "Host reboot started"
 

data/locale/es/hammer_cli_foreman_discovery.po

@@ -6,7 +6,7 @@
 # Sergio Ocón <sergio.ocon@redhat.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-05-19 09:24+0000\n"
 "Last-Translator: Sergio Ocón <sergio.ocon@redhat.com>\n"
@@ -33,9 +33,6 @@ msgstr "Nombre"
 msgid "MAC"
 msgstr "Dirección MAC"
 
-msgid "Last report"
-msgstr "Último informe"
-
 msgid "CPUs"
 msgstr "Procesadores"
 
@@ -51,7 +48,7 @@ msgstr "Tamaño de discos"
 msgid "Subnet"
 msgstr "Subred"
 
-msgid "Last Report"
+msgid "Last report"
 msgstr "Último informe"
 
 msgid "IP"
@@ -96,9 +93,23 @@ msgstr "Introduzca el password de root para el host:"
 msgid "Auto provision a host"
 msgstr "Provisionar un host automático"
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Hosts created"
+msgstr "El host se ha creado"
+
 msgid "Reboot a host"
 msgstr "Reiniciar un host"
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Rebooting hosts"
+msgstr "Reiniciar un host"
+
 msgid "Host reboot started"
 msgstr "Comenzó el reinicio del host"
 

data/locale/fr/hammer_cli_foreman_discovery.po

@@ -6,7 +6,7 @@
 # Claer <transiblu@claer.hammock.fr>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_discovery 0.0.2\n"
+"Project-Id-Version: hammer_cli_foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-03-21 22:02+0000\n"
 "Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
@@ -32,9 +32,6 @@ msgstr "Nom"
 msgid "MAC"
 msgstr "MAC"
 
-msgid "Last report"
-msgstr "Dernier rapport"
-
 msgid "CPUs"
 msgstr "CPUs"
 
@@ -50,7 +47,7 @@ msgstr "Taille des disques"
 msgid "Subnet"
 msgstr "Sous-Réseau"
 
-msgid "Last Report"
+msgid "Last report"
 msgstr "Dernier rapport"
 
 msgid "IP"
@@ -95,9 +92,23 @@ msgstr "Saisir le mot de passe root de l'hôte :"
 msgid "Auto provision a host"
 msgstr "Provisionner un hôte automatiquement"
 
+msgid "Auto provision all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Hosts created"
+msgstr "Hôte créé"
+
 msgid "Reboot a host"
 msgstr "Redémarrage d'un hôte"
 
+msgid "Reboot all discovered hosts"
+msgstr ""
+
+#, fuzzy
+msgid "Rebooting hosts"
+msgstr "Redémarrage d'un hôte"
+
 msgid "Host reboot started"
 msgstr "Redémarrage de l'hôte lancé"