hammer_cli_csv 1.0.2 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTEwYmI3Y2E5OTYxMGNhYzYwYzg2YjI2YzYyOGQ4MGJkYjkxNWNjNA==
+    N2ExODdkOTg4YzFhYmNhZjIyNDdkNTZjMjFjOGVjYjliOWM0OTA0Mw==
   data.tar.gz: !binary |-
-    NzM5ODc4MzE5YmE1NThkMjgyYWY2N2YwMDhjY2ZhN2YyMjE5MWRhZA==
+    Njg1YmE0ZTMzMzE0NjlkM2E2NWMxMDI2N2QwM2Q5NDdmODViYzU2YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDQyZTliM2I3N2JkYmJmYjc4ZjExYjE4MTQ2M2JkODU1NGVkZGMzODQwMTBk
-    Y2Y3MmJlYzRmYzY2NGVmNWZjMGNiYmJhNTViZmFhY2M0ODA2ZTRlN2FmMmMy
-    NjdlZjIzYjJhMmVhNGIyMTNiNTA3ODVkYmYzZTBiMjI0MjhhZDY=
+    NzZlYzM4NWMxZGMzYzNlNzljYWZmNWQyZmE3NzQ2OWJjMWY0MjNjMGEzMzdi
+    NTVlM2NhZmM1ZjE4M2YzZWMxYzQ5M2E1OTZjMWRlNDE2MGUyYmE5YWU0NjYy
+    ODJmNDMyMWNiYzk4NTEzODk4MjkzMjZlNjE1MDNiOThhNDRkZGM=
   data.tar.gz: !binary |-
-    MmE3N2Y1MDNmZmM4ZGE0Y2FkYTgwMDhiZWY0ZjNiYWNlZDUwZmMyZDBkNjc1
-    YTMyZTUzMzIxZjRlMzkzYmFlZjAzYWM0MDViYzhmNDI0MzNiYzRhMWU2MGY4
-    MGE2NGU5YmMyOGU3NGY3MDZlNzM1ZmM4NDViMDYxOGZjM2Y3MTg=
+    ZDNhNzIwOWU1N2Y0NWVhYjI5Y2Y1MTgzMzY0NDM2MzZiNjVkNDY3MDk1YzQ1
+    OWE4MDY2YjkzOGJjYTZlOWNlM2U3ZTE5MzdlMWU2ZTY4YTk2ZWEwNWNjY2Y2
+    Mzc3MTMzZTEwNWU4NjcxMzBmOGJiMjA5M2VhYWYyNWRmY2RkNjA=

data/config/cli_config.yml

@@ -29,4 +29,10 @@
   :products_sync: false
 
 :gutterball:
-  :enable_module: true
+  :enable_module: true
+
+:foreman_remote_execution:
+  :enable_module: true
+
+:import:
+  :enable_module: true

data/lib/hammer_cli_csv/activation_keys.rb

@@ -9,68 +9,48 @@ module HammerCLICsv
       LIMIT = 'Limit'
       ENVIRONMENT = 'Environment'
       CONTENTVIEW = 'Content View'
-      HOSTCOLLECTIONS = 'System Groups'
+      HOSTCOLLECTIONS = 'Host Collections'
+      SERVICELEVEL = "Service Level"
+      RELEASEVER = "Release Version"
+      AUTOATTACH = "Auto-Attach"
       SUBSCRIPTIONS = 'Subscriptions'
 
       def export
         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|
-              next if option_organization && organization['name'] != option_organization
-
-              @headpin.get("organizations/#{organization['label']}/activation_keys").each do |activationkey|
-                name = namify(activationkey['name'])
-                description = activationkey['description']
-                limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : activationkey['usage_limit']
-                environment = @headpin.environment(activationkey['environment_id'])['name']
-                contentview = @headpin.content_view(activationkey['content_view_id'])['name']
-                # TODO: https://bugzilla.redhat.com/show_bug.cgi?id=1160888
-                #       Act keys in SAM-1 do not include system groups
-                hostcollections = nil #???? export_column(activationkey, 'systemGroups', 'name')
-                subscriptions = CSV.generate do |column|
-                  column << activationkey['pools'].collect do |subscription|
-                    amount = subscription['calculatedAttributes']['compliance_type'] == 'Stackable' ? 1 : 'Automatic'
-                    "#{amount}|#{subscription['productId']}|#{subscription['productName']}"
-                  end
+                  HOSTCOLLECTIONS, AUTOATTACH, SERVICELEVEL, RELEASEVER, SUBSCRIPTIONS]
+          @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']
+            })['results'].each do |activationkey|
+              name = namify(activationkey['name'])
+              count = 1
+              description = activationkey['description']
+              limit = activationkey['unlimited_content_hosts'] ? 'Unlimited' : activationkey['max_content_hosts']
+              environment = activationkey['environment']['label']
+              contentview = activationkey['content_view']['name']
+              hostcollections = export_column(activationkey, 'host_collections', 'name')
+              autoattach = activationkey['auto_attach'] ? 'Yes' : 'No'
+              servicelevel = activationkey['service_level']
+              releasever = activationkey['release_version']
+              subscriptions = CSV.generate do |column|
+                column << @api.resource(:subscriptions).call(:index, {
+                              'organization_id' => organization['id'],
+                              'activation_key_id' => activationkey['id']
+                          })['results'].collect do |subscription|
+                  amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
+                  sku = subscription['product_id'].match(/\A[0-9]/) ? 'Custom' : subscription['product_id']
+                  "#{amount}|#{sku}|#{subscription['product_name']}"
                 end
-                subscriptions.delete!("\n")
-                csv << [name, organization['label'], description, limit, environment, contentview,
-                        hostcollections, subscriptions]
-              end
-            end
-          else
-            @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']
-              })['results'].each do |activationkey|
-                name = namify(activationkey['name'])
-                count = 1
-                description = activationkey['description']
-                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, {
-                                'organization_id' => organization['id'],
-                                'activation_key_id' => activationkey['id']
-                            })['results'].collect do |subscription|
-                    amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
-                    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['name'], description, limit, environment, contentview,
-                        hostcollections, subscriptions]
               end
+              subscriptions.delete!("\n")
+              csv << [name, count, organization['name'], description, limit, environment, contentview,
+                      hostcollections, servicelevel, releasever, autoattach, subscriptions]
             end
           end
         end
@@ -111,6 +91,9 @@ module HammerCLICsv
                      'unlimited_content_hosts' => (line[LIMIT] == 'Unlimited') ? true : false,
                      'max_content_hosts' => (line[LIMIT] == 'Unlimited') ? nil : line[LIMIT].to_i
                    }
+          params['auto_attach'] = (line[AUTOATTACH] == 'Yes' ? true : false) if params['auto_attach']
+          params['service_level'] = line[SERVICELEVEL].nil? || line[SERVICELEVEL].empty? ? nil : line[SERVICELEVEL]
+          params['release_version'] = line[RELEASEVER].nil? || line[RELEASEVER].empty? ? nil : line[RELEASEVER]
           if !@existing[line[ORGANIZATION]].include? name
             print _("Creating activation key '%{name}'...") % {:name => name} if option_verbose?
             activationkey = @api.resource(:activation_keys).call(:create, params)

data/lib/hammer_cli_csv/base.rb

@@ -546,6 +546,37 @@ module HammerCLICsv
       result
     end
 
+    def foreman_provisioning_template(options = {})
+      @query_config_templates ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @query_config_templates[options[:name]]
+        if !options[:id]
+          config_template = @api.resource(:config_templates).call(:index, {
+                                              :per_page => 999999,
+                                              'search' => "name=\"#{options[:name]}\""
+                                            })['results']
+          raise "Provisioning template '#{options[:name]}' not found" if !config_template || config_template.empty?
+          options[:id] = config_template[0]['id']
+          @query_config_templates[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      else
+        return nil if options[:id].nil?
+        options[:name] = @query_config_templates.key(options[:id])
+        if !options[:name]
+          config_template = @api.resource(:config_templates).call(:show, {'id' => options[:id]})
+          raise "Provisioning template 'id=#{options[:id]}' not found" if !config_template || config_template.empty?
+          options[:name] = config_template['name']
+          @query_config_templates[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      end
+
+      result
+    end
+
     def foreman_smart_proxy(options = {})
       @query_smart_proxies ||= {}
 
@@ -717,7 +748,7 @@ module HammerCLICsv
           results = @api.resource(:subscriptions).call(:index, {
               :per_page => 999999,
               'organization_id' => foreman_organization(:name => organization),
-              'search' => "name:\"#{options[:name]}\""
+              'search' => "name = \"#{options[:name]}\""
           })
           raise "No subscriptions match '#{options[:name]}'" if results['subtotal'] == 0
           raise "Too many subscriptions match '#{options[:name]}'" if results['subtotal'] > 1
@@ -864,11 +895,11 @@ module HammerCLICsv
       [name, major || '', minor || '']
     end
 
-    def export_column(object, name, field)
+    def export_column(object, name, field=nil)
       return '' unless object[name]
       values = CSV.generate do |column|
         column << object[name].collect do |fields|
-          fields[field]
+          field.nil? ? yield(fields) : fields[field]
         end
       end
       values.delete!("\n")

data/lib/hammer_cli_csv/compute_resources.rb

@@ -45,28 +45,27 @@ module HammerCLICsv
       def create_compute_resources_from_csv(line)
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
+          params = {
+            'compute_resource' => {
+              'name' => name,
+              'url' => line[URL],
+              'provider' => line[PROVIDER]
+            }
+          }
           if !@existing.include? name
             print "Creating compute resource '#{name}'..." if option_verbose?
-            id = @api.resource(:compute_resources).call(:create, {
-                'compute_resource' => {
-                    'name' => name,
-                    'url' => line[URL]
-                }
-            })['id']
+            id = @api.resource(:compute_resources).call(:create, params)['id']
           else
             print "Updating compute resource '#{name}'..." if option_verbose?
-            id = @api.resource(:compute_resources).call(:update, {
-                'id' => @existing[name],
-                'compute_resource' => {
-                    'name' => name,
-                    'url' => line[URL]
-                }
-            })['compute_resource']['id']
+            id = @existing[name]
+            params['id'] = id
+            @api.resource(:compute_resources).call(:update, params)
           end
 
           # Update associated resources
-          associate_organizations(id, line[ORGANIZATIONS], 'compute_resource')
-          associate_locations(id, line[LOCATIONS], 'compute_resource')
+          # TODO: this doesn't work "Environments you cannot remove environments that are used by hosts or inherited."
+          #associate_organizations(id, line[ORGANIZATIONS], 'compute_resource')
+          #associate_locations(id, line[LOCATIONS], 'compute_resource')
 
           print "done\n" if option_verbose?
         end

data/lib/hammer_cli_csv/content_hosts.rb

@@ -165,9 +165,11 @@ module HammerCLICsv
         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, {
+            @api.resource(:hosts).call(:update, {
                 'id' => host_id,
-                'guest_ids' => guest_ids
+                'host' => {
+                    'guest_ids' => guest_ids
+                }
             })
           end
           puts _('done') if option_verbose?
@@ -178,21 +180,25 @@ module HammerCLICsv
         return if option_organization && line[ORGANIZATION] != option_organization
 
         if !@existing[line[ORGANIZATION]]
-          @existing[line[ORGANIZATION]] = {}
+          @existing[line[ORGANIZATION]] = true
           # Fetching all content hosts is too slow and times out due to the complexity of the data
           # rendered in the json.
           # http://projects.theforeman.org/issues/6307
-          total = @api.resource(:systems).call(:index, {
+          total = @api.resource(:hosts).call(:index, {
               'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
               'per_page' => 1
           })['total'].to_i
           (total / 20 + 2).to_i.times do |page|
-            @api.resource(:systems).call(:index, {
+            @api.resource(:hosts).call(:index, {
                 'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
                 'page' => page + 1,
                 'per_page' => 20
             })['results'].each do |host|
-              @existing[line[ORGANIZATION]][host['name']] = host['uuid'] if host
+              @existing[host['name']] = {
+                :host => host['id'],
+                :subscription => host['subscription']['id'],
+                :content => host['content']['id']
+              }
             end
           end
         end
@@ -200,42 +206,52 @@ module HammerCLICsv
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
 
-          if !@existing[line[ORGANIZATION]].include? name
+          if !@existing.include? name
             print(_("Creating content host '%{name}'...") % {:name => name}) if option_verbose?
-            host_id = @api.resource(:systems).call(:create, {
+            host_id = @api.resource(:host_subscriptions).call(:register, {
                 'name' => name,
                 'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
+                'lifecycle_environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
                 'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
                 'facts' => facts(name, line),
                 'installed_products' => products(line),
                 'service_level' => line[SLA],
                 'type' => 'system'
-            })['uuid']
-            @existing[line[ORGANIZATION]][name] = host_id
+            })['id']
+            @existing[name] = host_id
           else
+            # TODO: remove passing facet IDs to update
+            # Bug #13849 - updating a host's facet should not require the facet id to be included in facet params
+            #              http://projects.theforeman.org/issues/13849
             print(_("Updating content host '%{name}'...") % {:name => name}) if option_verbose?
-            host_id = @api.resource(:systems).call(:update, {
-                'id' => @existing[line[ORGANIZATION]][name],
-                'system' => {
+            host_id = @api.resource(:hosts).call(:update, {
+                'id' => @existing[name][:host],
+                'host' => {
                     'name' => name,
-                    'environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
-                    'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW]),
-                    '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']
+                    'content_facet_attributes' => {
+                        'id' => @existing[name][:content],
+                        'lifecycle_environment_id' => lifecycle_environment(line[ORGANIZATION], :name => line[ENVIRONMENT]),
+                        'content_view_id' => katello_contentview(line[ORGANIZATION], :name => line[CONTENTVIEW])
+                    },
+                    'subscription_facet_attributes' => {
+                        'id' => @existing[name][:subscription],
+                        'facts' => facts(name, line),
+                        # TODO: PUT /hosts subscription_facet_attributes missing "installed_products"
+                        # http://projects.theforeman.org/issues/13854
+                        #'installed_products' => products(line),
+                        'service_level' => line[SLA]
+                    }
+                }
+            })['host_id']
           end
 
           if line[VIRTUAL] == 'Yes' && line[HOST]
-            raise "Content host '#{line[HOST]}' not found" if !@existing[line[ORGANIZATION]][line[HOST]]
-            @hypervisor_guests[@existing[line[ORGANIZATION]][line[HOST]]] ||= []
-            @hypervisor_guests[@existing[line[ORGANIZATION]][line[HOST]]] << "#{line[ORGANIZATION]}/#{name}"
+            raise "Content host '#{line[HOST]}' not found" if !@existing[line[HOST]]
+            @hypervisor_guests[@existing[line[HOST]]] ||= []
+            @hypervisor_guests[@existing[line[HOST]]] << @existing[name]
           end
 
+          update_host_facts(host_id, line)
           update_host_collections(host_id, line)
           update_subscriptions(host_id, line)
 
@@ -262,12 +278,15 @@ module HammerCLICsv
         facts
       end
 
+      def update_host_facts(host_id, line)
+      end
+
       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, {
+          @api.resource(:host_collections).call(:add_hosts, {
               'id' => katello_hostcollection(line[ORGANIZATION], :name => hostcollection_name),
-              'system_ids' => [host_id]
+              'hosts_ids' => [host_id]
           })
         end
       end
@@ -299,29 +318,16 @@ module HammerCLICsv
       end
 
       def update_subscriptions(host_id, line)
-        existing_subscriptions = @api.resource(:systems).call(:subscriptions, {
-            'per_page' => 999999,
-            'id' => host_id
+        existing_subscriptions = @api.resource(:host_subscriptions).call(:index, {
+            'host_id' => host_id
         })['results']
-        if existing_subscriptions.length > 0
-          @api.resource(:subscriptions).call(:destroy, {
-            'system_id' => host_id,
-            'id' => existing_subscriptions[0]['id']
+        if existing_subscriptions.length != 0
+          @api.resource(:host_subscriptions).call(:remove_subscriptions, {
+            'host_id' => host_id,
+            'subscriptions' => existing_subscriptions
           })
         end
 
-        # existing_subscriptions = @api.resource(:subscriptions).call(:index, {
-        #     'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-        #     'per_page' => 999999,
-        #     'system_id' => host_id
-        # })['results']
-        # if existing_subscriptions.length > 0
-        #   @api.resource(:subscriptions).call(:destroy, {
-        #     'system_id' => host_id,
-        #     'id' => existing_subscriptions[0]['id']
-        #   })
-        # end
-
         return if line[SUBSCRIPTIONS].nil? || line[SUBSCRIPTIONS].empty?
 
         subscriptions = CSV.parse_line(line[SUBSCRIPTIONS], {:skip_blanks => true}).collect do |details|
@@ -332,8 +338,8 @@ module HammerCLICsv
           }
         end
 
-        @api.resource(:subscriptions).call(:create, {
-            'system_id' => host_id,
+        @api.resource(:host_subscriptions).call(:add_subscriptions, {
+            'host_id' => host_id,
             'subscriptions' => subscriptions
         })
       end

data/lib/hammer_cli_csv/content_view_filters.rb

@@ -96,7 +96,7 @@ module HammerCLICsv
                 'inclusion' => filter_inclusion?(line[TYPE]),
                 'repository_ids' => repository_ids
             })['id']
-            @existing_filters[line[ORGANIZATION]][filter_name] = filter_id
+            @existing_filters[line[ORGANIZATION]][line[CONTENTVIEW]][filter_name] = filter_id
           else
             print "Updating filter '#{filter_name}' for content view filter '#{line[CONTENTVIEW]}'..." if option_verbose?
             @api.resource(:content_view_filters).call(:update, {
@@ -173,7 +173,7 @@ module HammerCLICsv
       end
 
       def export_filter_type(type)
-        case type.split[1]
+        case type
         when /rpm/i
           'Packages'
         when /package_group/i

data/lib/hammer_cli_csv/content_views.rb

@@ -106,32 +106,26 @@ module HammerCLICsv
                 'description' => line[DESCRIPTION],
                 'composite' => is_composite
             }
-            if is_composite
-              options['component_ids'] = composite_ids
-            else
-              options['repository_ids'] = repository_ids
-            end
             contentview_id = @api.resource(:content_views).call(:create, options)['id']
             @existing_contentviews[line[ORGANIZATION]][name] = contentview_id
-            publish = true
           else
             print _("Updating content view '%{name}'...") % {:name => name} if option_verbose?
-            options = {
-                'id' => contentview_id,
-                'description' => line[DESCRIPTION]
-            }
-            if is_composite
-              options['component_ids'] = composite_ids
-            else
-              options['repository_ids'] = repository_ids
-            end
-            contentview = @api.resource(:content_views).call(:update, options)
-            contentview_id = contentview['id']
-            publish = contentview['versions'].empty?
           end
 
+          options = {
+            'id' => contentview_id,
+            'description' => line[DESCRIPTION]
+          }
+          if is_composite
+            options['component_ids'] = composite_ids
+          else
+            options['repository_ids'] = repository_ids
+          end
+          contentview = @api.resource(:content_views).call(:update, options)
+          contentview_id = contentview['id']
+
           # Content views cannot be used in composites unless a publish has occurred
-          publish_content_view(contentview_id, line) if publish
+          publish_content_view(contentview_id, line) if contentview['versions'].empty?
           promote_content_view(contentview_id, line)
 
           puts _('done') if option_verbose?

data/lib/hammer_cli_csv/hosts.rb

@@ -6,16 +6,27 @@ module HammerCLICsv
 
       ORGANIZATION = 'Organization'
       LOCATION = 'Location'
-      ENVIRONMENT = 'Environment'
+      ENVIRONMENT = 'Puppet Environment'
       OPERATINGSYSTEM = 'Operating System'
       ARCHITECTURE = 'Architecture'
       MACADDRESS = 'MAC Address'
       DOMAIN = 'Domain'
       PARTITIONTABLE = 'Partition Table'
+      SUBNET = 'Subnet'
+      REALM = 'Realm'
+      MEDIUM = 'Medium'
+      HOSTGROUP = 'Hostgroup'
+      COMPUTERESOURCE = 'Compute Resource'
+      COMPUTEPROFILE = 'Compute Profile'
+      IMAGE = 'Image'
+      ENABLED = 'Enabled'
+      MANAGED = 'Managed'
 
       def export
         CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, ORGANIZATION, LOCATION, ENVIRONMENT, OPERATINGSYSTEM, ARCHITECTURE, MACADDRESS, DOMAIN, PARTITIONTABLE]
+          csv << [NAME, ORGANIZATION, LOCATION, ENVIRONMENT, OPERATINGSYSTEM, ARCHITECTURE,
+                  MACADDRESS, DOMAIN, PARTITIONTABLE, SUBNET, REALM, MEDIUM, HOSTGROUP,
+                  COMPUTERESOURCE, COMPUTEPROFILE, IMAGE, ENABLED, MANAGED]
           search_options = {:per_page => 999999}
           search_options['search'] = "organization=\"#{option_organization}\"" if option_organization
           @api.resource(:hosts).call(:index, search_options)['results'].each do |host|
@@ -23,15 +34,28 @@ module HammerCLICsv
             raise "Host 'id=#{host['id']}' not found" if !host || host.empty?
 
             name = host['name']
-            organization = foreman_organization(:id => host['organization_id'])
-            environment = foreman_environment(:id => host['environment_id'])
-            operatingsystem = foreman_operatingsystem(:id => host['operatingsystem_id'])
-            architecture = foreman_architecture(:id => host['architecture_id'])
+            organization = host['organization_name']
+            location = host['location_name']
+            environment = host['environment_name']
+            operatingsystem = host['operatingsystem_name']
+            architecture = host['architecture_name']
             mac = host['mac']
-            domain = foreman_domain(:id => host['domain_id'])
-            ptable = foreman_partitiontable(:id => host['ptable_id'])
+            domain = host['domain_name']
+            ptable = host['ptable_name']
+            subnet = host['subnet_name']
+            realm = host['realm_name']
+            medium = host['medium_name']
+            hostgroup = host['hostgroup_name']
+            compute_resource = host['compute_resource_name']
+            compute_profile = host['compute_profile_name']
+            image = host['image_name']
 
-            csv << [name, organization, environment, operatingsystem, architecture, mac, domain, ptable]
+            enabled = host['enabled'] ? 'Yes' : 'No'
+            managed = host['managed'] ? 'Yes' : 'No'
+
+            csv << [name, organization, location, environment, operatingsystem, architecture,
+                    mac, domain, ptable, subnet, realm, medium, hostgroup, compute_resource,
+                    compute_profile, image, enabled, managed]
           end
         end
       end

data/lib/hammer_cli_csv/import.rb

@@ -17,7 +17,7 @@ module HammerCLICsv
                       domains architectures partition_tables lifecycle_environments host_collections
                       provisioning_templates
                       subscriptions products content_views content_view_filters activation_keys
-                      hosts content_hosts smart_proxies reports roles users )
+                      hosts content_hosts smart_proxies compute_resources reports roles users )
       RESOURCES.each do |resource|
         dashed = resource.gsub('_', '-')
         option "--#{dashed}", 'FILE', "csv file for #{dashed}"
@@ -42,9 +42,14 @@ module HammerCLICsv
         @api = ApipieBindings::API.new({:uri => @server, :username => @username,
                                         :password => @password, :api_version => 2})
 
-        # Swing the hammers
+        resources_specified = RESOURCES.collect do |resource|
+          resource if self.send("option_#{resource}") || ARGV.include?('--' + resource.gsub('_', '-'))
+        end
+        resources_specified.compact!
         RESOURCES.each do |resource|
-          hammer_resource(resource)
+          if resources_specified.include?(resource) || (resources_specified == [] && option_dir)
+            hammer_resource(resource)
+          end
         end
 
         HammerCLI::EX_OK
@@ -62,7 +67,7 @@ module HammerCLICsv
 
       def hammer_resource(resource)
         return if !self.send("option_#{resource}") && !option_dir
-        options_file = self.send("option_#{resource}") || "#{option_dir}/#{resource.gsub('_', '-')}.csv"
+        options_file = "#{option_dir}/#{resource.gsub('_', '-')}.csv" || self.send("option_#{resource}")
         unless options_file_exists? options_file
           if option_dir
             puts _("Skipping #{resource} because '#{options_file}' does not exist") if option_verbose?

data/lib/hammer_cli_csv/job_templates.rb

@@ -6,14 +6,21 @@ module HammerCLICsv
 
       ORGANIZATIONS = 'Organizations'
       LOCATIONS = 'Locations'
+      DESCRIPTION = 'Description'
       JOB = 'Job Category'
       PROVIDER = 'Provider'
       SNIPPET = 'Snippet'
       TEMPLATE = 'Template'
+      INPUT_NAME = 'Input:Name'
+      INPUT_DESCRIPTION = 'Input:Description'
+      INPUT_REQUIRED = 'Input:Required'
+      INPUT_TYPE = 'Input:Type'
+      INPUT_PARAMETERS = 'Input:Parameters'
 
       def export
         CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, ORGANIZATIONS, LOCATIONS, JOB, PROVIDER, SNIPPET, TEMPLATE]
+          csv << [NAME, ORGANIZATIONS, LOCATIONS, DESCRIPTION, JOB, PROVIDER, SNIPPET, TEMPLATE,
+                  INPUT_NAME, INPUT_DESCRIPTION, INPUT_REQUIRED, INPUT_TYPE, INPUT_PARAMETERS]
           @api.resource(:job_templates).call(:index, {
               :per_page => 999999
           })['results'].each do |template_id|
@@ -21,12 +28,37 @@ module HammerCLICsv
             next if template['locked']
             next unless option_organization.nil? || template['organizations'].detect { |org| org['name'] == option_organization }
             name = template['name']
-            job = template['job_name']
+            description = template['description_format']
+            job = template['job_category']
             snippet = template['snippet'] ? 'Yes' : 'No'
             provider = template['provider_type']
             organizations = export_column(template, 'organizations', 'name')
             locations = export_column(template, 'locations', 'name')
-            csv << [name, organizations, locations, job, provider, snippet, template['template']]
+            csv << [name, organizations, locations, description, job, provider, snippet, template['template']]
+
+            template_columns = [name] + Array.new(7)
+            @api.resource(:template_inputs).call(:index, {
+                :template_id => template['id']
+            })['results'].each  do|input|
+              input_field = nil
+              input_options = nil
+              case input['input_type']
+              when /user/
+                input_name = export_column(input, 'options') do |value|
+                  value
+                end
+              when /fact/
+                input_name = input['fact_name']
+              when /variable/
+                input_name = input['variable_name']
+              when /puppet_parameter/
+                input_name = "#{input['puppet_class_name']}|#{input['puppet_parameter_name']}"
+              else
+                raise _("Unknown job template input type '%{type}'") % {:type => input['input_type']}
+              end
+              required = input['required'] ? 'Yes' : 'No'
+              csv << template_columns + [input['name'], input['description'], required, input['input_type'], input_name]
+            end
           end
         end
       end
@@ -58,30 +90,13 @@ module HammerCLICsv
         end
 
         count(line[COUNT]).times do |number|
-          name = namify(line[NAME], number)
-          job_name = namify(line[JOB], number)
-          options = {
-                'job_template' => {
-                  'name' => name,
-                  'job_name' => job_name,
-                  'snippet' => line[SNIPPET] == 'Yes' ? true : false,
-                  'provider_type' => line[PROVIDER],
-                  'organization_ids' => organizations,
-                  'location_ids' => locations,
-                  'template' => line[TEMPLATE]
-                }
-          }
-          template_id = @existing[name]
-          if !template_id
-            print _("Creating job template '%{name}'...") % {:name => name } if option_verbose?
-            template_id = @api.resource(:job_templates).call(:create, options)['id']
-            @existing[name] = template_id
+          if line[INPUT_NAME].nil? || line[INPUT_NAME].empty?
+            create_template(line, number)
           else
-            print _("Updating job template '%{name}'...") % {:name => name} if option_verbose?
-            options['id'] = template_id
-            template_id = @api.resource(:job_templates).call(:update, options)['id']
+            create_template_input(line, number)
           end
 
+          # ????
           # Update associated resources
           # @template_organizations ||= {}
           # organizations.each do |organization_id|
@@ -122,12 +137,81 @@ module HammerCLICsv
           #   end
           # end
 
-          puts _('done') if option_verbose?
         end
       rescue RuntimeError => e
         raise "#{e}\n       #{line[NAME]}"
       end
 
+      def create_template(line, number)
+        name = namify(line[NAME], number)
+        job_category = namify(line[JOB], number)
+        options = {
+              'job_template' => {
+                'name' => name,
+                'description_format' => line[DESCRIPTION],
+                'job_category' => job_category,
+                'snippet' => line[SNIPPET] == 'Yes' ? true : false,
+                'provider_type' => line[PROVIDER],
+                #'organization_ids' => organizations,
+                #'location_ids' => locations,
+                'template' => line[TEMPLATE]
+              }
+        }
+        template_id = @existing[name]
+        if !template_id
+          print _("Creating job template '%{name}'...") % {:name => name } if option_verbose?
+          template_id = @api.resource(:job_templates).call(:create, options)['id']
+          @existing[name] = template_id
+        else
+          print _("Updating job template '%{name}'...") % {:name => name} if option_verbose?
+          options['id'] = template_id
+          template_id = @api.resource(:job_templates).call(:update, options)['id']
+        end
+        puts _('done') if option_verbose?
+      end
+
+      def create_template_input(line, number)
+        name = namify(line[NAME], number)
+        template_id = @existing[name]
+        raise "Job template '#{name}' must exist before setting inputs" unless template_id
+
+        options = {
+          'template_id' => template_id,
+          'template_input' => {
+            'name' => line[INPUT_NAME],
+            'description' => line[INPUT_DESCRIPTION],
+            'input_type' => line[INPUT_TYPE],
+            'required' => line[INPUT_REQUIRED] == 'Yes' ? true : false
+          }
+        }
+        case line[INPUT_TYPE]
+        when /user/
+          options['template_input']['options'] = line[INPUT_PARAMETERS]
+        when /fact/
+          options['template_input']['fact_name'] = line[INPUT_PARAMETERS]
+        when /variable/
+          options['template_input']['variable_name'] = line[INPUT_PARAMETERS]
+        when /puppet_parameter/
+          options['template_input']['puppet_class_name'], options['template_input']['puppet_parameter_name'] = line[INPUT_PARAMETERS].split('|')
+        else
+          raise _("Unknown job template input type '%{type}'") % {:type => line[INPUT_TYPE]}
+        end
+
+        template_input = @api.resource(:template_inputs).call(:index, {
+            :template_id => template_id,
+            :search => "name = \"#{line[INPUT_NAME]}\""
+        })['results']
+        if template_input.empty?
+          print _("Creating job template input '%{input_name}' on '%{name}'...") % {:input_name => line[INPUT_NAME], :name => name}
+          @api.resource(:template_inputs).call(:create, options)
+        else
+          print _("Updating job template input '%{input_name}' on '%{name}'...") % {:input_name => line[INPUT_NAME], :name => name}
+          options['id'] = template_input[0]['id']
+          @api.resource(:template_inputs).call(:update, options)
+        end
+        puts _('done') if option_verbose?
+      end
+
       def export_associations(template)
         return '' unless template['template_combinations']
         values = CSV.generate do |column|

data/lib/hammer_cli_csv/lifecycle_environments.rb

@@ -55,7 +55,8 @@ module HammerCLICsv
 
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
-          prior = namify(line[PRIORENVIRONMENT], number)
+          prior = line[PRIORENVIRONMENT] == 'Library' ? 'Library' :
+                                            namify(line[PRIORENVIRONMENT], number)
           raise "Organization '#{line[ORGANIZATION]}' does not exist" if !@existing.include? line[ORGANIZATION]
           if !@existing[line[ORGANIZATION]].include? name
             print "Creating environment '#{name}'..." if option_verbose?

data/lib/hammer_cli_csv/operating_systems.rb

@@ -6,15 +6,32 @@ module HammerCLICsv
 
       FAMILY = 'Family'
       DESCRIPTION = 'Description'
+      PASSWORD_HASH = 'Password Hash'
+      PARTITION_TABLES = 'Partition Tables'
+      ARCHITECTURES = 'Architectures'
+      MEDIA = 'Media'
+      PROVISIONING_TEMPLATES = 'Provisioning Templates'
+      PARAMETERS = 'Parameters'
 
       def export
         CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, DESCRIPTION, FAMILY]
-          @api.resource(:operatingsystems).call(:index, {:per_page => 999999})['results'].each do |operatingsystem|
+          csv << [NAME, DESCRIPTION, FAMILY, PASSWORD_HASH, PARTITION_TABLES, ARCHITECTURES, MEDIA,
+                  PROVISIONING_TEMPLATES, PARAMETERS]
+          @api.resource(:operatingsystems).call(:index, {:per_page => 999999})['results'].each do |operatingsystem_id|
+            operatingsystem = @api.resource(:operatingsystems).call(:show, {:id => operatingsystem_id['id']})
             name = build_os_name(operatingsystem['name'], operatingsystem['major'], operatingsystem['minor'])
             description = operatingsystem['description']
             family = operatingsystem['family']
-            csv << [name, description, family]
+            password_hash = operatingsystem['password_hash']
+            partition_tables = export_column(operatingsystem, 'ptables', 'name')
+            architectures = export_column(operatingsystem, 'architectures', 'name')
+            media = export_column(operatingsystem, 'media', 'name')
+            partition_tables = export_column(operatingsystem, 'ptables', 'name')
+            parameters = export_column(operatingsystem, 'parameters') do |parameter|
+              "#{parameter['name']}|#{parameter['value']}"
+            end
+            csv << [name, description, family, password_hash, partition_tables, architectures,
+                    media, partition_tables, parameters]
           end
         end
       end
@@ -34,9 +51,21 @@ module HammerCLICsv
         params =  {
           'operatingsystem' => {
             'family' => line[FAMILY],
-            'description' => line[DESCRIPTION]
+            'description' => line[DESCRIPTION],
+            'password_hash' => line[PASSWORD_HASH]
           }
         }
+        params['operatingsystem']['architecture_ids'] = collect_column(line[ARCHITECTURES]) do |name|
+          foreman_architecture(:name => name)
+        end
+        # TODO: http://projects.theforeman.org/issues/12919
+        #params['operatingsystem']['provisioning_template_ids'] = collect_column(line[PROVISIONING_TEMPLATES]) do |name|
+        #  foreman_provisioning_template(:name => name)
+        #end
+        # TODO: http://projects.theforeman.org/issues/12920
+        #params['operatingsystem']['os_parameters?'] = collect_column(line[PARAMETERS]) do |name_value|
+        #  ????
+        #end
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           (osname, major, minor) = split_os_name(name)

data/lib/hammer_cli_csv/products.rb

@@ -14,7 +14,8 @@ module HammerCLICsv
 
       def export
         CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, LABEL, ORGANIZATION, REPOSITORY, REPOSITORY_TYPE, REPOSITORY_URL]
+          csv << [NAME, LABEL, ORGANIZATION, DESCRIPTION, REPOSITORY, REPOSITORY_TYPE,
+                  REPOSITORY_URL]
           @api.resource(:organizations).call(:index, {
               :per_page => 999999
           })['results'].each do |organization|
@@ -32,7 +33,8 @@ module HammerCLICsv
                 repository_type = repository['product_type'] == 'custom' ? 'Custom' : 'Red Hat'
                 repository_type += " #{repository['content_type'].capitalize}"
                 csv << [product['name'], product['label'], organization['name'],
-                        repository['name'], repository_type, repository['url']]
+                        product['description'], repository['name'], repository_type,
+                        repository['url']]
               end
             end
           end
@@ -77,6 +79,12 @@ module HammerCLICsv
 
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
+          params = {
+            :name => name,
+            'organization_id' => foreman_organization(:name => line[ORGANIZATION])
+          }
+          params[:description] = line[DESCRIPTION] if !line[DESCRIPTION].nil? &&
+                                                      !line[DESCRIPTION].empty?
           product_id = @existing_products[line[ORGANIZATION]][name]
           if product_id.nil?
             print _("Creating product '%{name}'...") % {:name => name} if option_verbose?
@@ -85,14 +93,12 @@ module HammerCLICsv
                 {:name => name, :organization => line[ORGANIZATION]}
             end
 
-            product_id = @api.resource(:products).call(:create, {
-                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                'name' => name
-            })['id']
+            product_id = @api.resource(:products).call(:create, params)['id']
             @existing_products[line[ORGANIZATION]][name] = product_id
           else
-            # Nothing to update for products
             print _("Updating product '%{name}'...") % {:name => name} if option_verbose?
+            params[:id] = product_id
+            @api.resource(:products).call(:update, params)
           end
           @existing_repositories[line[ORGANIZATION] + name] = {}
 

data/lib/hammer_cli_csv/provisioning_templates.rb

@@ -4,6 +4,9 @@ module HammerCLICsv
       command_name 'provisioning-templates'
       desc         'import or export provisioning templates'
 
+      option %w(--include-locked), :flag, 'Include locked templates (will fail if re-imported)',
+                                   :attribute_name => :option_include_locked
+
       ORGANIZATIONS = 'Organizations'
       LOCATIONS = 'Locations'
       OPERATINGSYSTEMS = 'Operating Systems'
@@ -14,12 +17,13 @@ module HammerCLICsv
       def export
         CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
           csv << [NAME, ORGANIZATIONS, LOCATIONS, OPERATINGSYSTEMS, ASSOCIATIONS, KIND, TEMPLATE]
-          @api.resource(:config_templates).call(:index, {
+          params = {
               :per_page => 999999
-          })['results'].each do |template_id|
+          }
+          params['search'] =  "organization = \"#{option_organization}\"" if option_organization
+          @api.resource(:config_templates).call(:index, params)['results'].each do |template_id|
             template = @api.resource(:config_templates).call(:show, {:id => template_id['id']})
-            next if template['locked']
-            next unless option_organization.nil? || template['organizations'].detect { |org| org['name'] == option_organization }
+            next if template['locked'] && !option_include_locked?
             name = template['name']
             kind = template['snippet'] ? 'snippet' : template['template_kind_name']
             organizations = export_column(template, 'organizations', 'name')

data/lib/hammer_cli_csv/subscriptions.rb

@@ -108,6 +108,7 @@ module HammerCLICsv
       end
 
       def import_manifest_from_csv(line)
+        return if option_organization && line[ORGANIZATION] != option_organization
         args = %W{
           --server #{ @server } --username #{ @username } --password #{ @password }
           subscription upload --file #{ line[MANIFEST] }

data/lib/hammer_cli_csv/version.rb

@@ -1,5 +1,5 @@
 module HammerCLICsv
   def self.version
-    @version ||= Gem::Version.new('1.0.2')
+    @version ||= Gem::Version.new('2.0.0')
   end
 end

data/test/data/hosts.csv

@@ -1,4 +1,4 @@
-Name,Count,Organization,Location,Environment,Operating System,Architecture,MAC Address,Domain,Partition Table
+Name,Count,Organization,Location,Puppet Environment,Operating System,Architecture,MAC Address,Domain,Partition Table
 dhcp130-%03d.megacorp.com,255,Mega Corporation,Asia Pacific,Development,RHEL 6.4,x86_64,"02:FE:B5:E0:70:%02x",megacorp.com,RedHat default
 dhcp129-%03d.megacorp.com,255,Mega Corporation,Development,RHEL 6.4,x86_64,"01:FE:B5:E0:70:%02x",megacorp.com,RedHat default
 # dhcp129-1%02d.megacorp.com,255,Mega Corporation,Development,RHEL 6.4,x86_64,"01:FE:B5:E1:70:%02x",megacorp.com,RedHat default

data/test/data/products.csv

@@ -1,19 +1,20 @@
 Name,Count,Label,Organization,Repository,Repository Type,Repository Url
-katello-client-1.4,1,katello-client-1_4,Mega Corporation,katello-1.4-client,Custom Yum,http://fedorapeople.org/groups/katello/releases/yum/1.4-client/RHEL/6Server/x86_64/
-katello-1.4,1,katello-1_4,Mega Corporation,katello-1.4,Custom Yum,http://fedorapeople.org/groups/katello/releases/yum/1.4/RHEL/6Server/x86_64/
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.1,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.1/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.2,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.2/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.3,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.3/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.4,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.4/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.5,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.5/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.1,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.1/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.2,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.2/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.3,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.3/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.4,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.4/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.5,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.5/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server Kickstart x86_64 7.0,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7.0/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server Kickstart) x86_64 7Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/kickstart
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server RPMs x86_64 7.0,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7.0/x86_64/os
-Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server RPMs x86_64 7Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/os
+Puppet Labs,1,puppetlabs,Mega Corporation,puppet-forge,Custom Puppet,https://forge.puppetlabs.com/
+# katello-client-1.4,1,katello-client-1_4,Mega Corporation,katello-1.4-client,Custom Yum,http://fedorapeople.org/groups/katello/releases/yum/1.4-client/RHEL/6Server/x86_64/
+# katello-1.4,1,katello-1_4,Mega Corporation,katello-1.4,Custom Yum,http://fedorapeople.org/groups/katello/releases/yum/1.4/RHEL/6Server/x86_64/
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.1,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.1/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.2,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.2/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.3,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.3/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.4,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.4/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6.5,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.5/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server Kickstart x86_64 6Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.1,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.1/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.2,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.2/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.3,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.3/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.4,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.4/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6.5,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6.5/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 6 Server RPMs x86_64 6Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server Kickstart x86_64 7.0,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7.0/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server Kickstart) x86_64 7Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/kickstart
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server RPMs x86_64 7.0,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7.0/x86_64/os
+# Red Hat Enterprise Linux Server,1,Red_Hat_Enterprise_Linux_Server,Mega Corporation,Red Hat Enterprise Linux 7 Server RPMs x86_64 7Server,Red Hat Yum,https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/os

data/test/data/settings.csv

@@ -1,5 +1,2 @@
 Name,Count,Value
-administrator,1,root@example.com
 idle_timeout,1,60000
-remote_execution_global_proxy,1,true
-require_ssl_smart_proxies,1,false

data/test/job_templates_test.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), 'csv_test_helper')
+
+describe 'job-templates' do
+
+  extend CommandTestHelper
+
+  context "import" do
+    it "create job template with input" do
+      set_user 'admin'
+
+      name = "jobtemplate#{rand(10000)}"
+
+      file = Tempfile.new('job_templates_test')
+      # rubocop:disable LineLength
+      file.write <<-FILE
+"Name","Organizations","Locations","Description","Job Category","Provider","Snippet","Template","Input:Name","Input:Description","Input:Required","Input:Type","Input:Parameters"
+"#{name}","","","","TEST","SSH","No","<%= input(""command"") %>"
+"#{name}","","","","","","","","command","command to run","Yes","user",""
+FILE
+      # rubocop:enable LineLength
+      file.rewind
+      stdout,stderr = capture {
+        hammer.run(%W{csv job-templates --verbose --file #{file.path}})
+      }
+      stderr.must_equal ''
+      lines = stdout.split("\n")
+      lines[0].must_equal "Creating job template '#{name}'...done"
+      lines[1].must_equal "Creating job template input 'command' on '#{name}'...done"
+      file.unlink
+    end
+  end
+end

data/test/settings_test.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), 'csv_test_helper')
+
+describe 'job-templates' do
+
+  extend CommandTestHelper
+
+  context "import" do
+    it "update settings w/ Count column" do
+      set_user 'admin'
+
+      name = "settings#{rand(10000)}"
+
+      file = Tempfile.new('settings_test')
+      # rubocop:disable LineLength
+      file.write <<-FILE
+Name,Count,Value
+idle_timeout,1,60000
+FILE
+      file.rewind
+
+      stdout,stderr = capture {
+        hammer.run(%W{csv settings --verbose --file #{file.path}})
+      }
+      stderr.must_equal ''
+      lines = stdout.split("\n")
+      lines[0].must_equal "Updating setting 'idle_timeout'...done"
+      file.unlink
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_csv
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas McKay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_katello
@@ -123,8 +123,10 @@ files:
 - test/helpers/resource_disabled.rb
 - test/hosts_test.rb
 - test/import_test.rb
+- test/job_templates_test.rb
 - test/organizations_test.rb
 - test/roles_test.rb
+- test/settings_test.rb
 - test/setup_test.rb
 - test/users_test.rb
 homepage: http://github.com/Katello/hammer-cli-csv
@@ -185,7 +187,9 @@ test_files:
 - test/helpers/resource_disabled.rb
 - test/hosts_test.rb
 - test/import_test.rb
+- test/job_templates_test.rb
 - test/organizations_test.rb
 - test/roles_test.rb
+- test/settings_test.rb
 - test/setup_test.rb
 - test/users_test.rb