hammer_cli_csv 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTZmY2U4MTYyOGVjYjU0ZDNmMTg3ZjA4ODY4NDFlYjQzNWJmZDA0OQ==
+    MGJkZWM3ZjQ5NzFhZmJiMGU1NDI5MDcyZGY5MjgyYWMzYzdmYjlkZQ==
   data.tar.gz: !binary |-
-    YzNlNDUwZDIyZTk4ODA3MTUwOWRhNTY1NGJkNGVlN2U2N2U5MWY5Mg==
+    NDcxOGFmM2Y0YmRkOTAzMzg2Nzg4M2MxNWEzZTEwYzIzNGVkNjNhZg==
 SHA512:
   metadata.gz: !binary |-
-    MThjNzUwYTg4NDJjOTNlZDQzZjUxMjQyNTJmMDVmM2FmOGI3ZjFlYmJmZTMw
-    MWYzZWI2ZjNlYWNmNTA0MjI4NmMyYjc0ZTIxMDFhOWJhMTU2ODBkOTRjNzZm
-    NDIzYzUzMmJmZTc3NDUwNTZkM2ZkZWZmNzJlZDhhZjgwMjNkN2Y=
+    ZDhjYTkwMDEyYWY1MWMwNDkxNDQwNmMxZmNiODBiNWNjNmMxOTY0ZGE3Mjhi
+    OTc2ODVmZjU3ZmE2Yjk2ZWRkM2U3NjczYjhhNmE3YjcxY2YwZmU5MzUxYmFl
+    OGI0MjNmMTBjMWFkNDYxYzEyNzZjZmU0YjQzNmY5MGYxMWFiMjQ=
   data.tar.gz: !binary |-
-    ZjM0MWExNTUyOWU5MmY3NGUwM2YzYTVmZDVhZmNjNDg0MzUyNTdlYWE1ZjU1
-    NTc3NDU2YWFmOTllMjMwODVhOGIwOGQ3NTAyODQwNjA5NzgwYjNkMjYyMTll
-    MzU5OTlkZjJmOTRkZWJmMWQ4ZGNiMTEwMGQzNmZhNGIxNWI5OGM=
+    YmIxNmEzNWQ3MzQ5MDc0Y2U1YmQwYTkzYzdmYWViNzhkNjdjZjJhOTc4MTIw
+    MzM2OTgxOGEzN2IxZDAzOWI1MzdiZDQ4ZTM5MmU1MjJjNDQ2ZTQwNjRkMzI0
+    NWMwZDdiNTRmNjFiYmM4MmNlYjA1ZjdiZGZkZjQ0OWViN2FkN2U=

data/config/cli_config.yml

@@ -0,0 +1,30 @@
+:ui:
+  :interactive: true
+  :per_page: 20
+  :history_file: './log/history'
+
+:watch_plain: true # enable/disable color output of logger in Clamp commands
+
+:log_dir: './log'
+:log_level: 'error'
+:log_api_calls: false
+:log_size: 5 # MB
+
+:foreman:
+  :enable_module: true
+  :host:          'http://katello:3000'
+  :username:      'admin'
+  :password:      'changeme'
+
+:katello:
+  :enable_module: true
+
+:csv:
+  :enable_module: true
+  :host:          'http://katello:3000'
+  :username:      'admin'
+  :password:      'changeme'
+  :products_sync: false
+
+:gutterball:
+  :enable_module: true

data/config/csv.yml

@@ -0,0 +1,2 @@
+:csv:
+  :enable_module: true

data/lib/hammer_cli_csv.rb

@@ -13,6 +13,9 @@ require 'hammer_cli'
 require 'hammer_cli/exit_codes'
 
 module HammerCLICsv
+  require 'hammer_cli_foreman'
+  require 'hammer_cli_foreman_tasks'
+
   require 'hammer_cli_csv/base'
   require 'hammer_cli_csv/exception_handler'
 
@@ -43,8 +46,10 @@ module HammerCLICsv
   require 'hammer_cli_csv/reports'
   require 'hammer_cli_csv/roles'
   require 'hammer_cli_csv/smart_proxies'
+  require 'hammer_cli_csv/splice'
   require 'hammer_cli_csv/subnets'
   require 'hammer_cli_csv/subscriptions'
+  require 'hammer_cli_csv/sync_plans'
   require 'hammer_cli_csv/users'
 
   require 'hammer_cli_csv/headpin_api'

data/lib/hammer_cli_csv/activation_keys.rb

@@ -13,7 +13,9 @@ module HammerCLICsv
   class CsvCommand
     class ActivationKeysCommand < BaseCommand
       command_name 'activation-keys'
-      desc         'import or export activation keys'
+      desc         _('import or export activation keys')
+
+      option %w(--organization), 'ORGANIZATION', _('Only process organization matching this name')
 
       ORGANIZATION = 'Organization'
       DESCRIPTION = 'Description'
@@ -29,6 +31,8 @@ module HammerCLICsv
                   HOSTCOLLECTIONS, SUBSCRIPTIONS]
           if @server_status['release'] == 'Headpin'
             @headpin.get(:organizations).each do |organization|
+              next if option_organization && organization['name'] != option_organization
+
               @headpin.get("organizations/#{organization['label']}/activation_keys").each do |activationkey|
                 name = namify(activationkey['name'])
                 count = 1
@@ -54,6 +58,8 @@ module HammerCLICsv
             @api.resource(:organizations).call(:index, {
                 :per_page => 999999
             })['results'].each do |organization|
+              next if option_organization && organization['name'] != option_organization
+
               @api.resource(:activation_keys).call(:index, {
                   'per_page' => 999999,
                   'organization_id' => organization['id']
@@ -61,20 +67,22 @@ module HammerCLICsv
                 name = namify(activationkey['name'])
                 count = 1
                 description = activationkey['description']
-                limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : activationkey['usage_limit']
+                limit = activationkey['unlimited_content_hosts'] ? 'Unlimited' : activationkey['max_content_hosts']
                 environment = activationkey['environment']['label']
                 contentview = activationkey['content_view']['name']
                 hostcollections = export_column(activationkey, 'systemGroups', 'name')
                 subscriptions = CSV.generate do |column|
                   column << @api.resource(:subscriptions).call(:index, {
-                                                        'activation_key_id' => activationkey['id']
-                                                      })['results'].collect do |subscription|
+                                'organization_id' => organization['id'],
+                                'activation_key_id' => activationkey['id']
+                            })['results'].collect do |subscription|
                     amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
-                    "#{amount}|#{subscription['product_name']}"
+                    sku = subscription['product_id'].match(/\A[0-9]/) ? 'Custom' : subscription['product_id']
+                    "#{amount}|#{sku}|#{subscription['product_name']}"
                   end
                 end
                 subscriptions.delete!("\n")
-                csv << [name, count, organization['label'], description, limit, environment, contentview,
+                csv << [name, count, organization['name'], description, limit, environment, contentview,
                         hostcollections, subscriptions]
               end
             end
@@ -91,6 +99,8 @@ module HammerCLICsv
       end
 
       def create_activationkeys_from_csv(line)
+        return if option_organization && line[ORGANIZATION] != option_organization
+
         if !@existing[line[ORGANIZATION]]
           @existing[line[ORGANIZATION]] = {}
           @api.resource(:activation_keys).call(:index, {
@@ -104,38 +114,31 @@ module HammerCLICsv
         line[COUNT].to_i.times do |number|
           name = namify(line[NAME], number)
 
+          params = {
+                     'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                     'name' => name,
+                     'environment_id' => lifecycle_environment(line[ORGANIZATION],
+                                                               :name => line[ENVIRONMENT]),
+                     'content_view_id' => katello_contentview(line[ORGANIZATION],
+                                                              :name => line[CONTENTVIEW]),
+                     'description' => line[DESCRIPTION],
+                     'unlimited_content_hosts' => (line[LIMIT] == 'Unlimited') ? true : false,
+                     'max_content_hosts' => (line[LIMIT] == 'Unlimited') ? nil : line[LIMIT].to_i
+                   }
           if !@existing[line[ORGANIZATION]].include? name
-            print "Creating activation key '#{name}'..." if option_verbose?
-            activationkey = @api.resource(:activation_keys).call(:create, {
-                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                'name' => name,
-                'environment_id' => lifecycle_environment(line[ORGANIZATION],
-                                                          :name => line[ENVIRONMENT]),
-                'content_view_id' => katello_contentview(line[ORGANIZATION],
-                                                         :name => line[CONTENTVIEW]),
-                'description' => line[DESCRIPTION],
-                'usage_limit' => usage_limit(line[LIMIT])
-            })
+            print _("Creating activation key '%{name}'...") % {:name => name} if option_verbose?
+            activationkey = @api.resource(:activation_keys).call(:create, params)
             @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id']
           else
-            print "Updating activation key '#{name}'..." if option_verbose?
-            activationkey = @api.resource(:activation_keys).call(:update, {
-                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                'id' => @existing[line[ORGANIZATION]][name],
-                'name' => name,
-                'environment_id' => lifecycle_environment(line[ORGANIZATION],
-                                                          :name => line[ENVIRONMENT]),
-                'content_view_id' => katello_contentview(line[ORGANIZATION],
-                                                         :name => line[CONTENTVIEW]),
-                'description' => line[DESCRIPTION],
-                'usage_limit' => usage_limit(line[LIMIT])
-            })
-
-            update_subscriptions(activationkey, line)
-            update_groups(activationkey, line)
+            print _("Updating activation key '%{name}'...") % {:name => name} if option_verbose?
+            params['id'] = @existing[line[ORGANIZATION]][name]
+            activationkey = @api.resource(:activation_keys).call(:update, params)
           end
 
-          puts 'done' if option_verbose?
+          update_subscriptions(activationkey, line)
+          update_groups(activationkey, line)
+
+          puts _('done') if option_verbose?
         end
       end
 

data/lib/hammer_cli_csv/base.rb

@@ -75,6 +75,18 @@ module HammerCLICsv
         JSON.parse(response.body)
       end
 
+      url = "#{server}/api/v2/plugins"
+      uri = URI(url)
+      nethttp = Net::HTTP.new(uri.host, uri.port)
+      nethttp.use_ssl = uri.scheme == 'https'
+      nethttp.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      server_status['plugins'] = nethttp.start do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+        request.basic_auth(username, password)
+        response = http.request(request)
+        JSON.parse(response.body)['results']
+      end
+
       server_status
     end
 
@@ -92,13 +104,14 @@ module HammerCLICsv
       name.gsub(/[^a-z0-9\-_]/i, '_')
     end
 
-    def thread_import(return_headers = false)
+    def thread_import(return_headers = false, filename=nil, name_column=nil)
+      filename ||= option_csv_file || '/dev/stdin'
       csv = []
-      CSV.foreach(option_csv_file || '/dev/stdin', {
-                                                     :skip_blanks => true,
-                                                     :headers => :first_row,
-                                                     :return_headers => return_headers
-                                                   }) do |line|
+      CSV.foreach(filename, {
+          :skip_blanks => true,
+          :headers => :first_row,
+          :return_headers => return_headers
+      }) do |line|
         csv << line
       end
       lines_per_thread = csv.length / option_threads.to_i + 1
@@ -112,7 +125,7 @@ module HammerCLICsv
           lines = csv[start_index...finish_index].clone
           splits << Thread.new do
             lines.each do |line|
-              if line[NAME][0] != '#'
+              if line[name_column || NAME][0] != '#'
                 yield line
               end
             end
@@ -534,7 +547,7 @@ module HammerCLICsv
       result
     end
 
-    def katello_contentviewversion(organization, name, version)
+    def katello_contentviewversion(organization, name, version='latest')
       @contentviewversions ||= {}
       @contentviewversions[organization] ||= {}
       versionname = "#{version}|#{name}"
@@ -543,12 +556,17 @@ module HammerCLICsv
       id = @contentviewversions[organization][versionname]
       if !id
         contentview_id = katello_contentview(organization, :name => name)
-        @api.resource(:content_view_versions).call(:index, {
-            :per_page => 999999,
-            'content_view_id' => contentview_id
-        })['results'].each do |contentviewversion|
-          if contentviewversion['version'] == version.to_i
-            @contentviewversions[organization][versionname] = contentviewversion['id']
+        contentviewversions = @api.resource(:content_view_versions).call(:index, {
+                                  :per_page => 999999,
+                                  'content_view_id' => contentview_id
+                              })['results'].sort { |a, b| a['created_at'] <=> b['created_at'] }
+        if version == 'latest'
+          @contentviewversions[organization][versionname] = contentviewversions[-1]['id']
+        else
+          contentviewversions.each do |contentviewversion|
+            if contentviewversion['version'] == version.to_f
+              @contentviewversions[organization][versionname] = contentviewversion['id']
+            end
           end
         end
         id = @contentviewversions[organization][versionname]
@@ -639,12 +657,12 @@ module HammerCLICsv
                   {
                     :per_page => 999999,
                     'organization_id' => foreman_organization(:name => organization),
-                    'search' => "name:\"#{options[:name]}\""
+                    'search' => search_string('host-collections',options[:name])
                   })['results'].each do |hostcollection|
             @hostcollections[organization][hostcollection['name']] = hostcollection['id'] if hostcollection
           end
           options[:id] = @hostcollections[organization][options[:name]]
-          raise "System group '#{options[:name]}' not found" if !options[:id]
+          raise "Host collection '#{options[:name]}' not found" if !options[:id]
         end
         result = options[:id]
       else
@@ -652,7 +670,7 @@ module HammerCLICsv
         options[:name] = @hostcollections.key(options[:id])
         if !options[:name]
           hostcollection = @api.resource(:host_collections).call(:show, {'id' => options[:id]})
-          raise "System group '#{options[:name]}' not found" if !hostcollection || hostcollection.empty?
+          raise "Host collection '#{options[:name]}' not found" if !hostcollection || hostcollection.empty?
           options[:name] = hostcollection['name']
           @hostcollections[options[:name]] = options[:id]
         end
@@ -662,6 +680,41 @@ module HammerCLICsv
       result
     end
 
+    def katello_product(organization, options = {})
+      @products ||= {}
+      @products[organization] ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @products[organization][options[:name]]
+        if !options[:id]
+          @api.resource(:products).call(:index,
+                  {
+                    :per_page => 999999,
+                    'organization_id' => foreman_organization(:name => organization),
+                    'search' => search_string('host-collections',options[:name])
+                  })['results'].each do |product|
+            @products[organization][product['name']] = product['id'] if product
+          end
+          options[:id] = @products[organization][options[:name]]
+          raise "Host collection '#{options[:name]}' not found" if !options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @products.key(options[:id])
+        if !options[:name]
+          product = @api.resource(:host_collections).call(:show, {'id' => options[:id]})
+          raise "Host collection '#{options[:name]}' not found" if !product || product.empty?
+          options[:name] = product['name']
+          @products[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 != ''
@@ -750,5 +803,17 @@ module HammerCLICsv
         })
       end if locations && !locations.empty?
     end
+
+    private
+
+    def search_string(resource, name)
+      operator = case resource
+                 when "gpg-key", "sync-plan", "lifecycle-environment", "host-collections"
+                   @server_status['version'] && @server_status['version'].match(/\A1\.6/) ? ':' : '='
+                 else
+                   ':'
+                 end
+      "name#{operator}\"#{name}\""
+    end
   end
 end

data/lib/hammer_cli_csv/content_hosts.rb

@@ -9,35 +9,15 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-#
-# -= Systems CSV =-
-#
-# Columns
-#   Name
-#     - System 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
-#   MAC Address
-#     - MAC address
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "FF:FF:FF:FF:FF:%02x" -> "FF:FF:FF:FF:FF:0A"
-#     - Warning: be sure to keep count below 255 or MAC hex will exceed limit
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-require 'uri'
-
 module HammerCLICsv
   class CsvCommand
     class ContentHostsCommand < BaseCommand
+      include ::HammerCLIForemanTasks::Helper
+
       command_name 'content-hosts'
       desc         'import or export content hosts'
 
-      option %w(--sam), :flag, 'export from SAM-1.3 or SAM-1.4'
+      option %w(--organization), 'ORGANIZATION', 'Only process organization matching this name'
 
       ORGANIZATION = 'Organization'
       ENVIRONMENT = 'Environment'
@@ -67,92 +47,94 @@ module HammerCLICsv
       end
 
       def export_sam(csv)
-        guests_host = {}
-        system_ids = []
+        guests_hypervisor = {}
+        host_ids = []
 
         @headpin.get(:organizations).each do |organization|
-          #url = "#{server}/api/systems?organization_id=satellite-1"
-          system_ids = @headpin.get("organizations/#{organization['label']}/systems").collect do |system|
-            system['guests'].each { |guest| guests_host[guest['uuid']] = system['name'] }
-            system['uuid']
+          next if option_organization && organization['name'] != option_organization
+          host_ids = @headpin.get("organizations/#{organization['label']}/systems").collect do |host|
+            host['guests'].each { |guest| guests_hypervisor[guest['uuid']] = host['name'] }
+            host['uuid']
           end
         end
 
-        system_ids.each do |system_id|
-          system = @headpin.get("systems/#{system_id}")
-          system_subscriptions = @headpin.get("systems/#{system_id}/subscriptions")['entitlements']
+        host_ids.each do |host_id|
+          host = @headpin.get("systems/#{host_id}")
+          host_subscriptions = @headpin.get("systems/#{host_id}/subscriptions")['entitlements']
 
-          name = system['name']
+          name = host['name']
           count = 1
-          organization_name = system['owner']['displayName']
-          environment = system['environment']['name']
-          contentview = system['content_view']['name']
+          organization_name = host['owner']['displayName']
+          environment = host['environment']['name']
+          contentview = host['content_view']['name']
           hostcollections = nil
-          virtual = system['facts']['virt.is_guest'] == 'true' ? 'Yes' : 'No'
-          host = guests_host[system['uuid']]
-          if system['facts']['distribution.name']
-            operatingsystem = "#{system['facts']['distribution.name']} "
-            operatingsystem += system['facts']['distribution.version'] if system['facts']['distribution.version']
+          virtual = host['facts']['virt.is_guest'] == 'true' ? 'Yes' : 'No'
+          hypervisor = guests_hypervisor[host['uuid']]
+          if host['facts']['distribution.name']
+            operatingsystem = "#{host['facts']['distribution.name']} "
+            operatingsystem += host['facts']['distribution.version'] if host['facts']['distribution.version']
             operatingsystem.strip!
           end
-          architecture = system['facts']['uname.machine']
-          sockets = system['facts']['cpu.cpu_socket(s)']
-          ram = system['facts']['memory.memtotal']
-          cores = system['facts']['cpu.core(s)_per_socket'] || 1
-          sla = system['serviceLevel']
+          architecture = host['facts']['uname.machine']
+          sockets = host['facts']['cpu.cpu_socket(s)']
+          ram = host['facts']['memory.memtotal']
+          cores = host['facts']['cpu.core(s)_per_socket'] || 1
+          sla = host['serviceLevel']
 
           products = CSV.generate do |column|
-            column << system['installedProducts'].collect do |product|
+            column << host['installedProducts'].collect do |product|
               "#{product['productId']}|#{product['productName']}"
             end
           end
           products.delete!("\n")
 
           subscriptions = CSV.generate do |column|
-            column << system_subscriptions.collect do |subscription|
+            column << host_subscriptions.collect do |subscription|
               "#{subscription['quantity']}|#{subscription['productId']}|#{subscription['poolName']}"
             end
           end
           subscriptions.delete!("\n")
 
-          csv << [name, count, organization_name, environment, contentview, hostcollections, virtual, host,
+          csv << [name, count, organization_name, environment, contentview, hostcollections, virtual, hypervisor,
                   operatingsystem, architecture, sockets, ram, cores, sla, products, subscriptions]
         end
       end
 
       def export_foretello(csv)
         @api.resource(:organizations).call(:index, {:per_page => 999999})['results'].each do |organization|
+          next if option_organization && organization['name'] != option_organization
+
           @api.resource(:systems).call(:index, {
               'per_page' => 999999,
               'organization_id' => foreman_organization(:name => organization['name'])
-          })['results'].each do |system|
-            system = @api.resource(:systems).call(:show, {
-                'id' => system['uuid'],
+          })['results'].each do |host|
+            host = @api.resource(:systems).call(:show, {
+                'id' => host['uuid'],
                 'fields' => 'full'
             })
 
-            name = system['name']
+            name = host['name']
             count = 1
             organization_name = organization['name']
-            environment = system['environment']['label']
-            contentview = system['content_view']['name']
+            environment = host['environment']['label']
+            contentview = host['content_view']['name']
             hostcollections = CSV.generate do |column|
-              column << system['hostCollections'].collect do |hostcollection|
+              column << host['hostCollections'].collect do |hostcollection|
                 hostcollection['name']
               end
             end
             hostcollections.delete!("\n")
-            virtual = system['facts']['virt.is_guest'] == 'true' ? 'Yes' : 'No'
-            host = system['virtual_host'].nil? ? nil : system['virtual_host']['name']
-            operatingsystem = "#{system['facts']['distribution.name']} " if system['facts']['distribution.name']
-            operatingsystem += system['facts']['distribution.version'] if system['facts']['distribution.version']
-            architecture = system['facts']['uname.machine']
-            sockets = system['facts']['cpu.cpu_socket(s)']
-            ram = system['facts']['memory.memtotal']
-            cores = system['facts']['cpu.core(s)_per_socket'] || 1
+            virtual = host['facts']['virt.is_guest'] == 'true' ? 'Yes' : 'No'
+            hypervisor_host = host['virtual_host'].nil? ? nil : host['virtual_host']['name']
+            operatingsystem = "#{host['facts']['distribution.name']} " if host['facts']['distribution.name']
+            operatingsystem += host['facts']['distribution.version'] if host['facts']['distribution.version']
+            architecture = host['facts']['uname.machine']
+            sockets = host['facts']['cpu.cpu_socket(s)']
+            ram = host['facts']['memory.memtotal']
+            cores = host['facts']['cpu.core(s)_per_socket'] || 1
             sla = ''
             products = CSV.generate do |column|
-              column << system['installedProducts'].collect do |product|
+              column << host['installedProducts'].collect do |product|
                 "#{product['productId']}|#{product['productName']}"
               end
             end
@@ -160,37 +142,56 @@ module HammerCLICsv
             subscriptions = CSV.generate do |column|
               column << @api.resource(:subscriptions).call(:index, {
                   'organization_id' => organization['id'],
-                  'system_id' => system['uuid']
+                  'system_id' => host['uuid']
               })['results'].collect do |subscription|
                 "#{subscription['consumed']}|#{subscription['product_id']}|#{subscription['product_name']}"
               end
             end
             subscriptions.delete!("\n")
-            csv << [name, count, organization_name, environment, contentview, hostcollections, virtual, host,
+            csv << [name, count, organization_name, environment, contentview, hostcollections, virtual, hypervisor_host,
                     operatingsystem, architecture, sockets, ram, cores, sla, products, subscriptions]
           end
         end
       end
 
       def import
+        remote = @server_status['plugins'].detect { |plugin| plugin['name'] == 'foreman_csv' }
+        if remote.nil?
+          import_locally
+        else
+          import_remotely
+        end
+      end
+
+      def import_remotely
+        params = {'content' => ::File.new(::File.expand_path(option_csv_file), 'rb')}
+        headers = {:content_type => 'multipart/form-data', :multipart => true}
+        task_progress(@api.resource(:csv).call(:import_content_hosts, params, headers))
+      end
+
+      def import_locally
         @existing = {}
-        @host_guests = {}
+        @hypervisor_guests = {}
 
         thread_import do |line|
-          create_systems_from_csv(line)
+          create_content_hosts_from_csv(line)
         end
 
-        print 'Updating hypervisor and guest associations...' if option_verbose?
-        @host_guests.each do |host_id, guest_ids|
-          @api.resource(:systems).call(:update, {
-              'id' => host_id,
-              'guest_ids' => guest_ids
-          })
+        if !@hypervisor_guests.empty?
+          print(_('Updating hypervisor and guest associations...')) if option_verbose?
+          @hypervisor_guests.each do |host_id, guest_ids|
+            @api.resource(:systems).call(:update, {
+                'id' => host_id,
+                'guest_ids' => guest_ids
+            })
+          end
         end
-        puts 'done' if option_verbose?
+        puts _('done') if option_verbose?
       end
 
-      def create_systems_from_csv(line)
+      def create_content_hosts_from_csv(line)
+        return if option_organization && line[ORGANIZATION] != option_organization
+
         if !@existing[line[ORGANIZATION]]
           @existing[line[ORGANIZATION]] = {}
           # Fetching all content hosts is too slow and times out due to the complexity of the data
@@ -205,8 +206,8 @@ module HammerCLICsv
                 'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
                 'page' => page,
                 'per_page' => 20
-            })['results'].each do |system|
-              @existing[line[ORGANIZATION]][system['name']] = system['uuid'] if system
+            })['results'].each do |host|
+              @existing[line[ORGANIZATION]][host['name']] = host['uuid'] if host
             end
           end
         end
@@ -215,8 +216,8 @@ module HammerCLICsv
           name = namify(line[NAME], number)
 
           if !@existing[line[ORGANIZATION]].include? name
-            print "Creating content host '#{name}'..." if option_verbose?
-            system_id = @api.resource(:systems).call(:create, {
+            print(_("Creating content host '%{name}'...") % {:name => name}) if option_verbose?
+            host_id = @api.resource(:systems).call(:create, {
                 'name' => name,
                 'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
                 'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
@@ -226,10 +227,10 @@ module HammerCLICsv
                 'service_level' => line[SLA],
                 'type' => 'system'
             })['uuid']
-            @existing[line[ORGANIZATION]][name] = system_id
+            @existing[line[ORGANIZATION]][name] = host_id
           else
-            print "Updating content host '#{name}'..." if option_verbose?
-            system_id = @api.resource(:systems).call(:update, {
+            print(_("Updating content host '%{name}'...") % {:name => name}) if option_verbose?
+            host_id = @api.resource(:systems).call(:update, {
                 'id' => @existing[line[ORGANIZATION]][name],
                 'system' => {
                     'name' => name,
@@ -238,6 +239,7 @@ module HammerCLICsv
                     'facts' => facts(name, line),
                     'installed_products' => products(line)
                 },
+                'facts' => facts(name, line),
                 'installed_products' => products(line),  # TODO: http://projects.theforeman.org/issues/9191,
                 'service_level' => line[SLA]
             })['uuid']
@@ -245,14 +247,14 @@ module HammerCLICsv
 
           if line[VIRTUAL] == 'Yes' && line[HOST]
             raise "Content host '#{line[HOST]}' not found" if !@existing[line[ORGANIZATION]][line[HOST]]
-            @host_guests[@existing[line[ORGANIZATION]][line[HOST]]] ||= []
-            @host_guests[@existing[line[ORGANIZATION]][line[HOST]]] << "#{line[ORGANIZATION]}/#{name}"
+            @hypervisor_guests[@existing[line[ORGANIZATION]][line[HOST]]] ||= []
+            @hypervisor_guests[@existing[line[ORGANIZATION]][line[HOST]]] << "#{line[ORGANIZATION]}/#{name}"
           end
 
-          update_host_collections(system_id, line)
-          update_subscriptions(system_id, line)
+          update_host_collections(host_id, line)
+          update_subscriptions(host_id, line)
 
-          puts 'done' if option_verbose?
+          puts _('done') if option_verbose?
         end
       rescue RuntimeError => e
         raise "#{e}\n       #{line}"
@@ -275,12 +277,12 @@ module HammerCLICsv
         facts
       end
 
-      def update_host_collections(system_id, line)
+      def update_host_collections(host_id, line)
         return nil if !line[HOSTCOLLECTIONS]
         CSV.parse_line(line[HOSTCOLLECTIONS]).each do |hostcollection_name|
           @api.resource(:host_collections).call(:add_systems, {
               'id' => katello_hostcollection(line[ORGANIZATION], :name => hostcollection_name),
-              'system_ids' => [system_id]
+              'system_ids' => [host_id]
           })
         end
       end
@@ -311,16 +313,16 @@ module HammerCLICsv
         products
       end
 
-      def update_subscriptions(content_host_id, line)
+      def update_subscriptions(host_id, line)
         existing_subscriptions = @api.resource(:subscriptions).call(:index, {
             'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
             'per_page' => 999999,
-            'system_id' => content_host_id
+            'system_id' => host_id
         })['results']
         if existing_subscriptions.length > 0
-          @api.resource(:systems).call(:remove_subscriptions, {
-            'id' => content_host_id,
-            'subscriptions' => existing_subscriptions
+          @api.resource(:subscriptions).call(:destroy, {
+            'system_id' => host_id,
+            'id' => existing_subscriptions[0]['id']
           })
         end
 
@@ -330,12 +332,12 @@ module HammerCLICsv
           (amount, sku, name) = details.split('|')
           {
             :id => katello_subscription(line[ORGANIZATION], :name => name),
-            :quantity => (amount.nil? || amount.empty? || amount == 'Automatic') ? 0 : amount
+            :quantity => (amount.nil? || amount.empty? || amount == 'Automatic') ? 0 : amount.to_i
           }
         end
 
         @api.resource(:subscriptions).call(:create, {
-            'system_id' => content_host_id,
+            'system_id' => host_id,
             'subscriptions' => subscriptions
         })
       end