hammer_cli_csv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJkZWM3ZjQ5NzFhZmJiMGU1NDI5MDcyZGY5MjgyYWMzYzdmYjlkZQ==
+    NTEwYmI3Y2E5OTYxMGNhYzYwYzg2YjI2YzYyOGQ4MGJkYjkxNWNjNA==
   data.tar.gz: !binary |-
-    NDcxOGFmM2Y0YmRkOTAzMzg2Nzg4M2MxNWEzZTEwYzIzNGVkNjNhZg==
+    NzM5ODc4MzE5YmE1NThkMjgyYWY2N2YwMDhjY2ZhN2YyMjE5MWRhZA==
 SHA512:
   metadata.gz: !binary |-
-    ZDhjYTkwMDEyYWY1MWMwNDkxNDQwNmMxZmNiODBiNWNjNmMxOTY0ZGE3Mjhi
-    OTc2ODVmZjU3ZmE2Yjk2ZWRkM2U3NjczYjhhNmE3YjcxY2YwZmU5MzUxYmFl
-    OGI0MjNmMTBjMWFkNDYxYzEyNzZjZmU0YjQzNmY5MGYxMWFiMjQ=
+    ZDQyZTliM2I3N2JkYmJmYjc4ZjExYjE4MTQ2M2JkODU1NGVkZGMzODQwMTBk
+    Y2Y3MmJlYzRmYzY2NGVmNWZjMGNiYmJhNTViZmFhY2M0ODA2ZTRlN2FmMmMy
+    NjdlZjIzYjJhMmVhNGIyMTNiNTA3ODVkYmYzZTBiMjI0MjhhZDY=
   data.tar.gz: !binary |-
-    YmIxNmEzNWQ3MzQ5MDc0Y2U1YmQwYTkzYzdmYWViNzhkNjdjZjJhOTc4MTIw
-    MzM2OTgxOGEzN2IxZDAzOWI1MzdiZDQ4ZTM5MmU1MjJjNDQ2ZTQwNjRkMzI0
-    NWMwZDdiNTRmNjFiYmM4MmNlYjA1ZjdiZGZkZjQ0OWViN2FkN2U=
+    MmE3N2Y1MDNmZmM4ZGE0Y2FkYTgwMDhiZWY0ZjNiYWNlZDUwZmMyZDBkNjc1
+    YTMyZTUzMzIxZjRlMzkzYmFlZjAzYWM0MDViYzhmNDI0MzNiYzRhMWU2MGY4
+    MGE2NGU5YmMyOGU3NGY3MDZlNzM1ZmM4NDViMDYxOGZjM2Y3MTg=

data/config/cli_config.yml

@@ -10,6 +10,8 @@
 :log_api_calls: false
 :log_size: 5 # MB
 
+:request_timeout: 120
+
 :foreman:
   :enable_module: true
   :host:          'http://katello:3000'

data/lib/hammer_cli_csv.rb

@@ -1,14 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 require 'hammer_cli'
 require 'hammer_cli/exit_codes'
 
@@ -24,6 +13,7 @@ module HammerCLICsv
   require 'hammer_cli_csv/architectures'
   require 'hammer_cli_csv/compute_profiles'
   require 'hammer_cli_csv/compute_resources'
+  require 'hammer_cli_csv/containers'
   require 'hammer_cli_csv/content_hosts'
   require 'hammer_cli_csv/content_views'
   require 'hammer_cli_csv/content_view_filters'
@@ -31,8 +21,10 @@ module HammerCLICsv
   require 'hammer_cli_csv/export'
   require 'hammer_cli_csv/host_collections'
   require 'hammer_cli_csv/hosts'
+  require 'hammer_cli_csv/host_groups'
   require 'hammer_cli_csv/import'
   require 'hammer_cli_csv/installation_medias'
+  require 'hammer_cli_csv/job_templates'
   require 'hammer_cli_csv/lifecycle_environments'
   require 'hammer_cli_csv/locations'
   require 'hammer_cli_csv/operating_systems'
@@ -45,6 +37,7 @@ module HammerCLICsv
   require 'hammer_cli_csv/puppet_reports'
   require 'hammer_cli_csv/reports'
   require 'hammer_cli_csv/roles'
+  require 'hammer_cli_csv/settings'
   require 'hammer_cli_csv/smart_proxies'
   require 'hammer_cli_csv/splice'
   require 'hammer_cli_csv/subnets'

data/lib/hammer_cli_csv/activation_keys.rb

@@ -1,22 +1,9 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class ActivationKeysCommand < BaseCommand
       command_name 'activation-keys'
       desc         _('import or export activation keys')
 
-      option %w(--organization), 'ORGANIZATION', _('Only process organization matching this name')
-
       ORGANIZATION = 'Organization'
       DESCRIPTION = 'Description'
       LIMIT = 'Limit'
@@ -26,8 +13,8 @@ module HammerCLICsv
       SUBSCRIPTIONS = 'Subscriptions'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
                   HOSTCOLLECTIONS, SUBSCRIPTIONS]
           if @server_status['release'] == 'Headpin'
             @headpin.get(:organizations).each do |organization|
@@ -35,7 +22,6 @@ module HammerCLICsv
 
               @headpin.get("organizations/#{organization['label']}/activation_keys").each do |activationkey|
                 name = namify(activationkey['name'])
-                count = 1
                 description = activationkey['description']
                 limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : activationkey['usage_limit']
                 environment = @headpin.environment(activationkey['environment_id'])['name']
@@ -50,7 +36,7 @@ module HammerCLICsv
                   end
                 end
                 subscriptions.delete!("\n")
-                csv << [name, count, organization['label'], description, limit, environment, contentview,
+                csv << [name, organization['label'], description, limit, environment, contentview,
                         hostcollections, subscriptions]
               end
             end
@@ -111,7 +97,7 @@ module HammerCLICsv
           end
         end
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
 
           params = {
@@ -146,9 +132,9 @@ module HammerCLICsv
         if line[HOSTCOLLECTIONS] && line[HOSTCOLLECTIONS] != ''
           # TODO: note that existing system groups are not removed
           CSV.parse_line(line[HOSTCOLLECTIONS], {:skip_blanks => true}).each do |name|
-            @api.resource(:host_collections).call(:add_activation_keys, {
-                'id' => katello_hostcollection(line[ORGANIZATION], :name => name),
-                'activation_key_ids' => [activationkey['id']]
+            @api.resource(:activation_keys).call(:add_host_collections, {
+                'id' => activationkey['id'],
+                'host_collection_ids' => [katello_hostcollection(line[ORGANIZATION], :name => name)]
             })
           end
         end

data/lib/hammer_cli_csv/architectures.rb

@@ -1,30 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Architectures CSV =-
-#
-# Columns
-#   Name
-#     - Architecture name
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "os%d" -> "os1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class ArchitecturesCommand < BaseCommand
@@ -34,17 +7,13 @@ module HammerCLICsv
       OPERATINGSYSTEMS = 'Operating Systems'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATIONS, OPERATINGSYSTEMS]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, OPERATINGSYSTEMS]
           @api.resource(:architectures).call(:index, {:per_page => 999999})['results'].each do |architecture|
+            architecture = @api.resource(:architectures).call(:show, {:id => architecture['id']})
             name = architecture['name']
-            count = 1
-            # TODO: http://projects.theforeman.org/issues/4198
-            #operatingsystems = architecture['operatingsystem_ids'].collect do |operatingsystem_id|
-            #  foreman_operatingsystem(:id => operatingsystem_id)
-            #end.join(',')
-            operatingsystems = ''
-            csv << [name, count, operatingsystems]
+            operatingsystems = export_column(architecture, 'operatingsystems', 'title')
+            csv << [name, operatingsystems]
           end
         end
       end
@@ -61,7 +30,7 @@ module HammerCLICsv
       end
 
       def create_architectures_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           architecture_id = @existing[name]
           operatingsystem_ids = CSV.parse_line(line[OPERATINGSYSTEMS]).collect do |operatingsystem_name|

data/lib/hammer_cli_csv/base.rb

@@ -1,17 +1,7 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 require 'apipie-bindings'
 require 'hammer_cli'
 require 'json'
+require 'open-uri'
 require 'csv'
 require 'hammer_cli_csv/csv'
 
@@ -19,24 +9,37 @@ require 'hammer_cli_csv/csv'
 module HammerCLICsv
   class BaseCommand < HammerCLI::Apipie::Command
     option %w(-v --verbose), :flag, 'be verbose'
-    option %w(--threads), 'THREAD_COUNT', 'Number of threads to hammer with', :default => 1
-    option %w(--csv-export), :flag, 'Export current data instead of importing'
-    option %w(--csv-file), 'FILE_NAME', 'CSV file (default to /dev/stdout with --csv-export, otherwise required)'
+    option %w(--threads), 'THREAD_COUNT', 'Number of threads to hammer with',
+           :default => 1, :hidden => true
+    option %w(--export), :flag, 'Export current data instead of importing'
+    option %w(--file), 'FILE_NAME', 'CSV file (default to /dev/stdout with --csv-export, otherwise required)'
     option %w(--prefix), 'PREFIX', 'Prefix for all name columns'
+    option %w(--organization), 'ORGANIZATION', _('Only process organization matching this name')
+
+    option %w(--csv-file), 'FILE_NAME', 'Option --csv-file is deprecated. Use --file',
+           :deprecated => "Use --file", :hidden => true,
+           :attribute_name => :option_file
+    option %w(--csv-export), :flag, 'Option --csv-export is deprecated. Use --export',
+           :deprecated => "Use --export", :hidden => true,
+           :attribute_name => :option_export
+
 
     NAME = 'Name'
     COUNT = 'Count'
 
     def execute
-      @server = HammerCLI::Settings.settings[:_params][:host] ||
+      @server = (HammerCLI::Settings.settings[:_params] &&
+                 HammerCLI::Settings.settings[:_params][:host]) ||
         HammerCLI::Settings.get(:csv, :host) ||
         HammerCLI::Settings.get(:katello, :host) ||
         HammerCLI::Settings.get(:foreman, :host)
-      @username = HammerCLI::Settings.settings[:_params][:username] ||
+      @username = (HammerCLI::Settings.settings[:_params] &&
+                   HammerCLI::Settings.settings[:_params][:username]) ||
         HammerCLI::Settings.get(:csv, :username) ||
         HammerCLI::Settings.get(:katello, :username) ||
         HammerCLI::Settings.get(:foreman, :username)
-      @password = HammerCLI::Settings.settings[:_params][:password] ||
+      @password = (HammerCLI::Settings.settings[:_params] &&
+                   HammerCLI::Settings.settings[:_params][:password]) ||
         HammerCLI::Settings.get(:csv, :password) ||
         HammerCLI::Settings.get(:katello, :password) ||
         HammerCLI::Settings.get(:foreman, :password)
@@ -58,7 +61,7 @@ module HammerCLICsv
                                        })
       end
 
-      option_csv_export? ? export : import
+      option_export? ? export : import
       HammerCLI::EX_OK
     end
 
@@ -91,6 +94,7 @@ module HammerCLICsv
     end
 
     def namify(name_format, number = 0)
+      return '' unless name_format
       if name_format.index('%')
         name = name_format % number
       else
@@ -105,13 +109,13 @@ module HammerCLICsv
     end
 
     def thread_import(return_headers = false, filename=nil, name_column=nil)
-      filename ||= option_csv_file || '/dev/stdin'
+      filename ||= option_file || '/dev/stdin'
       csv = []
-      CSV.foreach(filename, {
+      CSV.new(open(filename), {
           :skip_blanks => true,
           :headers => :first_row,
           :return_headers => return_headers
-      }) do |line|
+      }).each do |line|
         csv << line
       end
       lines_per_thread = csv.length / option_threads.to_i + 1
@@ -480,6 +484,99 @@ module HammerCLICsv
       result
     end
 
+    def foreman_host(options = {})
+      @query_hosts ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @query_hosts[options[:name]]
+        if !options[:id]
+          host = @api.resource(:hosts).call(:index, {
+                                              :per_page => 999999,
+                                              'search' => "name=\"#{options[:name]}\""
+                                            })['results']
+          raise "Host '#{options[:name]}' not found" if !host || host.empty?
+          options[:id] = host[0]['id']
+          @query_hosts[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @query_hosts.key(options[:id])
+        if !options[:name]
+          host = @api.resource(:hosts).call(:show, {'id' => options[:id]})
+          raise "Host 'id=#{options[:id]}' not found" if !host || host.empty?
+          options[:name] = host['name']
+          @query_hosts[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      end
+
+      result
+    end
+
+    def foreman_hostgroup(options = {})
+      @query_hostgroups ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @query_hostgroups[options[:name]]
+        if !options[:id]
+          hostgroup = @api.resource(:hostgroups).call(:index, {
+                                              :per_page => 999999,
+                                              'search' => "name=\"#{options[:name]}\""
+                                            })['results']
+          raise "Host Group '#{options[:name]}' not found" if !hostgroup || hostgroup.empty?
+          options[:id] = hostgroup[0]['id']
+          @query_hostgroups[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @query_hostgroups.key(options[:id])
+        if !options[:name]
+          hostgroup = @api.resource(:hostgroups).call(:show, {'id' => options[:id]})
+          raise "Host Group 'id=#{options[:id]}' not found" if !hostgroup || hostgroup.empty?
+          options[:name] = hostgroup['name']
+          @query_hostgroups[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      end
+
+      result
+    end
+
+    def foreman_smart_proxy(options = {})
+      @query_smart_proxies ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @query_smart_proxies[options[:name]]
+        if !options[:id]
+          smart_proxy = @api.resource(:smart_proxies).call(:index, {
+                                              :per_page => 999999,
+                                              'search' => "name=\"#{options[:name]}\""
+                                            })['results']
+          raise "Smart Proxy '#{options[:name]}' not found" if !smart_proxy || smart_proxy.empty?
+          options[:id] = smart_proxy[0]['id']
+          @query_smart_proxies[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @query_smart_proxies.key(options[:id])
+        if !options[:name]
+          smart_proxy = @api.resource(:smart_proxies).call(:show, {'id' => options[:id]})
+          raise "Smart Proxy 'id=#{options[:id]}' not found" if !smart_proxy || smart_proxy.empty?
+          options[:name] = smart_proxy['name']
+          @query_smart_proxies[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      end
+
+      result
+    end
+
     def lifecycle_environment(organization, options = {})
       @lifecycle_environments ||= {}
       @lifecycle_environments[organization] ||= {
@@ -715,6 +812,38 @@ module HammerCLICsv
       result
     end
 
+    def foreman_container(options = {})
+      @containers ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @containers[options[:name]]
+        if !options[:id]
+          container = @api.resource(:containers).call(:index, {
+                                                       :per_page => 999999,
+                                                       'search' => "name=\"#{options[:name]}\""
+                                                     })['results']
+          raise "Container '#{options[:name]}' not found" if !container || container.empty?
+          options[:id] = container[0]['id']
+          @containers[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @containers.key(options[:id])
+        if !options[:name]
+          container = @api.resource(:containers).call(:show, {'id' => options[:id]})
+          raise "Container 'id=#{options[:id]}' not found" if !container || container.empty?
+          options[:name] = container['name']
+          @containers[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      end
+
+      result
+    end
+
+
     def build_os_name(name, major, minor)
       name += " #{major}" if major && major != ''
       name += ".#{minor}" if minor && minor != ''
@@ -804,6 +933,33 @@ module HammerCLICsv
       end if locations && !locations.empty?
     end
 
+    def apipie_check_param(resource, action, name)
+      method = @api.resource(pluralize(resource).to_sym).apidoc[:methods].detect do |api_method|
+        api_method[:name] == action.to_s
+      end
+      return false unless method
+
+      found = method[:params].detect do |param|
+        param[:full_name] == name
+      end
+      if !found
+        nested =  method[:params].detect do |param|
+          param[:name] == resource.to_s
+        end
+        if nested
+          found = nested[:params].detect do |param|
+            param[:full_name] == name
+          end
+        end
+      end
+      found
+    end
+
+    def count(value)
+      return 1 if value.nil? || value.empty?
+      value.to_i
+    end
+
     private
 
     def search_string(resource, name)