hammer_cli_csv 0.0.2 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjA5NThhYWI0N2FhOGQ1OGQzMzhhMjVkOTkzZjhkZmRiNmU4Y2Q4MQ==
+    NmZkZjQ0Zjg5NmI0MDZkNzExZTI5ZGM1MWE2NzA2MjAzMGZiMWRlYw==
   data.tar.gz: !binary |-
-    MGE4ZDU4M2ZlOGFkNTdkZjI1YmMxZWFmN2YyZWQ4NjAzMTlhODc5Zg==
+    MWYyZWY2MWQxNTMwNWM0ODBkN2I3Y2Q0ZmQzNmJmZTRiZTgwZTEwMw==
 SHA512:
   metadata.gz: !binary |-
-    OWNhYjM3ODA5Mjc1MWJhM2E4ZGMzZWQyMzNjYzFiMzhjZGUxMjFmMGVlN2Vj
-    NWZlNjllYzRjYzRmMDY1YmMxNjAxYjk0ZjBkYzAzZWI3MjU2NzkyZDc4NTQw
-    MTczZjA0N2NiNDdlMWQzMGEwMjRhZTg5NTFhMDk4ZGZjYzY2ZGY=
+    ZGQxN2E3Mjg4MzRiN2Y2Y2VhNGY3NDhjZDI3YTkwMjU3MGUxMzQ2ODBkNmE4
+    YjFjNTUwMWI4NmIyNmFiMzE0NjdjYjVhZmM3NTE1MWZlNDMxNzYzNjZlYmJh
+    MzI0YWJlMDE5MTViOTEyOTIxOGI3NDAzMDQ1ZjI5OGJmODA4M2U=
   data.tar.gz: !binary |-
-    YzA0YzQ0NDY4ZGE4NWU3N2I0N2Y5MzYwNGYxNTViOGY2Y2RhNTZjNTViOWM5
-    YzFiYzU2YjFiODU0OWQyMTllMTg1OGJkN2E2NTY0MmU1NWI0YjU4MzYwMDM1
-    MmY0YTIwN2Q5MWJjZTM3OWIyYzc2MDg4MTdkNzE1NTMzYTdmNTY=
+    NzIzZGE4OTg1NmE1ZDc0NjFiYjgzZjExZmQ1ODdkZmM2YmJlNGRhMmExODQ4
+    MWNhYWQ3MGI3NzIzMzQzZmVkYWM1ODAxYWZiODI3ZDAyNThlNWY4MDNhYmJl
+    OGZhNjQzMzU2ZDZjY2I2MTRiNWQxOWNiYmRjOTU3ZWNmZjU2Yzk=

data/lib/hammer_cli_csv.rb

@@ -25,6 +25,7 @@ module HammerCLICsv
   require 'hammer_cli_csv/content_views'
   require 'hammer_cli_csv/content_view_filters'
   require 'hammer_cli_csv/domains'
+  require 'hammer_cli_csv/export'
   require 'hammer_cli_csv/host_collections'
   require 'hammer_cli_csv/hosts'
   require 'hammer_cli_csv/import'
@@ -45,4 +46,6 @@ module HammerCLICsv
   require 'hammer_cli_csv/subnets'
   require 'hammer_cli_csv/subscriptions'
   require 'hammer_cli_csv/users'
+
+  require 'hammer_cli_csv/headpin_api'
 end

data/lib/hammer_cli_csv/activation_keys.rb

@@ -27,34 +27,60 @@ module HammerCLICsv
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
           csv << [NAME, COUNT, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
                   SYSTEMGROUPS, SUBSCRIPTIONS]
-          @api.resource(:organizations)\
-            .call(:index, {
-                    :per_page => 999999
-                  })['results'].each do |organization|
-            @api.resource(:activation_keys)\
+          if @server_status['release'] == 'Headpin'
+            @headpin.get(:organizations).each do |organization|
+              @headpin.get("organizations/#{organization['label']}/activation_keys").each do |activationkey|
+                puts "Writing activation key '#{activationkey['name']}'" if option_verbose?
+                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']
+                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
+                end
+                subscriptions.delete!("\n")
+                csv << [name, count, organization['label'], description, limit, environment, contentview,
+                        hostcollections, subscriptions]
+              end
+            end
+          else
+            @api.resource(:organizations)\
               .call(:index, {
-                      'per_page' => 999999,
-                      'organization_id' => organization['id']
-                    })['results'].each do |activationkey|
-              puts "Writing activation key '#{activationkey['name']}'" if option_verbose?
-              name = namify(activationkey['name'])
-              count = 1
-              description = activationkey['description']
-              limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : sytemgroup['usage_limit']
-              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|
-                  amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
-                  "#{amount}|#{subscription['product_name']}"
+                      :per_page => 999999
+                    })['results'].each do |organization|
+              @api.resource(:activation_keys)\
+                .call(:index, {
+                        'per_page' => 999999,
+                        'organization_id' => organization['id']
+                      })['results'].each do |activationkey|
+                puts "Writing activation key '#{activationkey['name']}'" if option_verbose?
+                name = namify(activationkey['name'])
+                count = 1
+                description = activationkey['description']
+                limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : sytemgroup['usage_limit']
+                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|
+                    amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
+                    "#{amount}|#{subscription['product_name']}"
+                  end
                 end
+                subscriptions.delete!("\n")
+                csv << [name, count, organization['label'], description, limit, environment, contentview,
+                        hostcollections, subscriptions]
               end
-              subscriptions.delete!("\n")
-              csv << [name, count, organization['label'], description, limit, environment, contentview,
-                      hostcollections, subscriptions]
             end
           end
         end
@@ -109,10 +135,10 @@ module HammerCLICsv
                       'description' => line[DESCRIPTION],
                       'usage_limit' => usage_limit(line[LIMIT])
                     })
-          end
 
-          update_subscriptions(activationkey, line)
-          update_groups(activationkey, line)
+            update_subscriptions(activationkey, line)
+            update_groups(activationkey, line)
+          end
 
           puts 'done' if option_verbose?
         end

data/lib/hammer_cli_csv/base.rb

@@ -15,6 +15,7 @@ require 'json'
 require 'csv'
 require 'hammer_cli_csv/csv'
 
+# rubocop:disable ClassLength
 module HammerCLICsv
   class BaseCommand < HammerCLI::Apipie::Command
     option %w(-v --verbose), :flag, 'be verbose'
@@ -40,17 +41,58 @@ module HammerCLICsv
         end
       end
 
-      @api = ApipieBindings::API.new({
-                                       :uri => option_server || HammerCLI::Settings.get(:csv, :host),
-                                       :username => option_username || HammerCLI::Settings.get(:csv, :username),
-                                       :password => option_password || HammerCLI::Settings.get(:csv, :password),
-                                       :api_version => 2
-                                     })
+      server = option_server ||
+        HammerCLI::Settings.get(:csv, :host) ||
+        HammerCLI::Settings.get(:katello, :host) ||
+        HammerCLI::Settings.get(:foreman, :host)
+      username = option_username ||
+        HammerCLI::Settings.get(:csv, :username) ||
+        HammerCLI::Settings.get(:katello, :username) ||
+        HammerCLI::Settings.get(:foreman, :username)
+      password = option_password ||
+        HammerCLI::Settings.get(:csv, :password) ||
+        HammerCLI::Settings.get(:katello, :password) ||
+        HammerCLI::Settings.get(:foreman, :password)
+
+      @server_status = check_server_status
+
+      unless @server_status['release'] == 'Headpin'
+        @api = ApipieBindings::API.new({
+                                         :uri => server,
+                                         :username => username,
+                                         :password => password,
+                                         :api_version => 2
+                                       })
+      else
+        @headpin = HeadpinApi.new({
+                                    :server => server,
+                                    :username => username,
+                                    :password => password
+                                  })
+      end
 
       option_csv_export? ? export : import
       HammerCLI::EX_OK
     end
 
+    def check_server_status
+      server = option_server || HammerCLI::Settings.get(:csv, :host)
+      username = option_username || HammerCLI::Settings.get(:csv, :username)
+      password = option_password || HammerCLI::Settings.get(:csv, :password)
+      url = "#{server}/api/status"
+      uri = URI(url)
+      server_status = Net::HTTP.start(uri.host, uri.port,
+                               :use_ssl => uri.scheme == 'https',
+                               :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+        request.basic_auth(username, password)
+        response = http.request(request)
+        JSON.parse(response.body)
+      end
+
+      server_status
+    end
+
     def namify(name_format, number = 0)
       if name_format.index('%')
         name = name_format % number
@@ -241,7 +283,8 @@ module HammerCLICsv
                                                'search' => "role=\"#{role}\""
                                              })['results']
       filters.each do |filter|
-        return filter['id'] if filter['resource_type'] == resource && filter['search'] == search
+        resource_type = (filter['resource_type'] || '').split(':')[-1] # To remove "Katello::" when present
+        return filter['id'] if resource_type == resource && filter['search'] == search
       end
 
       nil

data/lib/hammer_cli_csv/export.rb

@@ -0,0 +1,72 @@
+# 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 ExportCommand < HammerCLI::Apipie::Command
+      command_name 'export'
+      desc         'export into directory'
+
+      option %w(-v --verbose), :flag, 'be verbose'
+      option %w(--threads), 'THREAD_COUNT', 'Number of threads to hammer with', :default => 1
+      option %w(--server), 'SERVER', 'Server URL'
+      option %w(-u --username), 'USERNAME', 'Username to access server'
+      option %w(-p --password), 'PASSWORD', 'Password to access server'
+      option '--dir', 'DIRECTORY', 'directory to import from'
+
+      RESOURCES = %w( organizations locations puppet_environments operating_systems
+                      domains architectures partition_tables lifecycle_environments host_collections
+                      provisioning_templates
+                      subscriptions activation_keys hosts content_hosts reports roles users )
+      RESOURCES.each do |resource|
+        dashed = resource.sub('_', '-')
+        option "--#{dashed}", 'FILE', "csv file for #{dashed}"
+      end
+
+      def execute
+        @api = ApipieBindings::API.new({
+                                         :uri => option_server || HammerCLI::Settings.get(:csv, :host),
+                                         :username => option_username || HammerCLI::Settings.get(:csv, :username),
+                                         :password => option_password || HammerCLI::Settings.get(:csv, :password),
+                                         :api_version => 2
+                                       })
+
+        # Swing the hammers
+        RESOURCES.each do |resource|
+          hammer_resource(resource)
+        end
+
+        HammerCLI::EX_OK
+      end
+
+      def hammer(context = nil)
+        context ||= {
+          :interactive => false,
+          :username => 'admin', # TODO: this needs to come from config/settings
+          :password => 'changeme' # TODO: this needs to come from config/settings
+        }
+
+        HammerCLI::MainCommand.new('', context)
+      end
+
+      def hammer_resource(resource)
+        return if !self.send("option_#{resource}") && !option_dir
+        options_file = self.send("option_#{resource}") || "#{option_dir}/#{resource.sub('_', '-')}.csv"
+        args = %W( csv #{resource.sub('_', '-')} --csv-export --csv-file #{options_file} )
+        args << '-v' if option_verbose?
+        args += %W( --threads #{option_threads} )
+        args += %W( --server #{option_server} ) if option_server
+        hammer.run(args)
+      end
+    end
+  end
+end

data/lib/hammer_cli_csv/headpin_api.rb

@@ -0,0 +1,59 @@
+# Copyright 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 'csv'
+
+module HammerCLICsv
+  class HeadpinApi
+    def initialize(config)
+      @server = config[:server]
+      @username = config[:username]
+      @password = config[:password]
+    end
+
+    def get(name)
+      url = "#{@server}/api/#{name}"
+      uri = URI(url)
+      Net::HTTP.start(uri.host, uri.port,
+                      :use_ssl => uri.scheme == 'https',
+                      :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+        request.basic_auth(@username, @password)
+        response = http.request(request)
+        return JSON.parse(response.body)
+      end
+    end
+
+    def environment(id)
+      @environments ||= {}
+      environment = @environments[id]
+      if environment.nil?
+        environment = get("environments/#{id}")
+        raise environment['displayMessage'] if environment['displayMessage']
+        @environments[id] = environment
+      end
+
+      return environment
+    end
+
+    def content_view(id)
+      @content_views ||= {}
+      content_view = @content_views[id]
+      if content_view.nil?
+        content_view = get("content_views/#{id}")
+        raise content_view['displayMessage'] if content_view['displayMessage']
+        @content_views[id] = content_view
+      end
+
+      return content_view
+    end
+  end
+end

data/lib/hammer_cli_csv/import.rb

@@ -9,13 +9,6 @@
 # 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_csv'
-require 'hammer_cli_foreman'
-require 'hammer_cli_katello'
-require 'json'
-require 'csv'
-require 'uri'
 
 module HammerCLICsv
   class CsvCommand
@@ -30,9 +23,10 @@ module HammerCLICsv
       option %w(-p --password), 'PASSWORD', 'Password to access server'
       option '--dir', 'DIRECTORY', 'directory to import from'
 
-      RESOURCES = %w( organizations locations roles users puppet_environments operating_systems
+      RESOURCES = %w( organizations locations puppet_environments operating_systems
                       domains architectures partition_tables lifecycle_environments host_collections
-                      subscriptions activation_keys hosts content_hosts reports )
+                      provisioning_templates
+                      subscriptions activation_keys hosts content_hosts reports roles users )
       RESOURCES.each do |resource|
         dashed = resource.sub('_', '-')
         option "--#{dashed}", 'FILE', "csv file for #{dashed}"

data/lib/hammer_cli_csv/locations.rb

@@ -39,7 +39,7 @@ module HammerCLICsv
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
           csv << [NAME, COUNT, PARENT]
           @api.resource(:locations).call(:index, {:per_page => 999999})['results'].each do |location|
-            csv << [location['name'], 1]
+            csv << [location['name'], 1, '']
           end
         end
       end

data/lib/hammer_cli_csv/organizations.rb

@@ -37,30 +37,16 @@ module HammerCLICsv
       command_name 'organizations'
       desc         'import or export organizations'
 
-      option %w(--sam), :flag, 'export from SAM-1.3 or SAM-1.4'
-
-      ORGANIZATION = 'Organization'
+      LABEL = 'Label'
       DESCRIPTION = 'Description'
 
       def export
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATION, DESCRIPTION]
-          if option_sam?
-            server = option_server || HammerCLI::Settings.get(:csv, :host)
-            username = option_username || HammerCLI::Settings.get(:csv, :username)
-            password = option_password || HammerCLI::Settings.get(:csv, :password)
-            url = "#{server}/api/organizations"
-            uri = URI(url)
-            Net::HTTP.start(uri.host, uri.port,
-                            :use_ssl => uri.scheme == 'https',
-                            :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-              request = Net::HTTP::Get.new uri.request_uri
-              request.basic_auth(username, password)
-              response = http.request(request)
+          csv << [NAME, COUNT, LABEL, DESCRIPTION]
 
-              JSON.parse(response.body).each do |organization|
-                csv << [organization['name'], 1, organization['label'], organization['description']]
-              end
+          if @server_status['release'] == 'Headpin'
+            @headpin.get(:organizations).each do |organization|
+              csv << [organization['name'], 1, organization['label'], organization['description']]
             end
           else
             @api.resource(:organizations).call(:index, {:per_page => 999999})['results'].each do |organization|
@@ -84,7 +70,7 @@ module HammerCLICsv
       def create_organizations_from_csv(line)
         line[COUNT].to_i.times do |number|
           name = namify(line[NAME], number)
-          label = namify(line[ORGANIZATION], number)
+          label = namify(line[LABEL], number)
           if !@existing.include? name
             print "Creating organization '#{name}'... " if option_verbose?
             @api.resource(:organizations).call(:create, {

data/lib/hammer_cli_csv/provisioning_templates.rb

@@ -18,11 +18,11 @@ module HammerCLICsv
       ORGANIZATIONS = 'Organizations'
       LOCATIONS = 'Locations'
       KIND = 'Kind'
-      SOURCE = 'Source'
+      TEMPLATE = 'Template'
 
       def export
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATIONS, LOCATIONS, KIND, SOURCE]
+          csv << [NAME, COUNT, ORGANIZATIONS, LOCATIONS, KIND, TEMPLATE]
           @api.resource(:config_templates)\
             .call(:index, {
                     :per_page => 999999
@@ -66,25 +66,73 @@ module HammerCLICsv
           name = namify(line[NAME], number)
           if !@existing.include? name
             print "Creating provisioning template '#{name}'..." if option_verbose?
-            id = @api.resource(:config_templates)\
+            template_id = @api.resource(:config_templates)\
               .call(:create, {
                       'name' => name,
                       'snippet' => line[KIND] == 'snippet',
                       'template_kind_id' => line[KIND] == 'snippet' ? nil : foreman_template_kind(:name => line[KIND]),
-                      'organizations' => organizations,
-                      'locations' => locations
+                      'organization_ids' => organizations,
+                      'location_ids' => locations,
+                      'template' => line[TEMPLATE]
                     })['id']
           else
             print "Updating provisioning template '#{name}'..." if option_verbose?
-            id = @api.resource(:config_template)\
+            template_id = @api.resource(:config_templates)\
               .call(:update, {
                       'id' => @existing[name],
                       'name' => name,
-                      'organizations' => organizations,
-                      'locations' => locations
+                      'snippet' => line[KIND] == 'snippet',
+                      'template_kind_id' => line[KIND] == 'snippet' ? nil : foreman_template_kind(:name => line[KIND]),
+                      'organization_ids' => organizations,
+                      'location_ids' => locations,
+                      'template' => line[TEMPLATE]
                     })['id']
           end
-          @existing[name] = id
+          @existing[name] = template_id
+
+          # Update associated resources
+          template_organizations ||= {}
+          organizations.each do |organization_id|
+            if template_organizations[organization_id].nil?
+              template_organizations[organization_id] = @api.resource(:organizations)\
+                .call(:show, {
+                        'id' => organization_id
+                      })['config_templates'].collect do |template|
+                template['id']
+              end
+            end
+            if !template_organizations[organization_id].include? template_id
+              template_organizations[organization_id] += [template_id]
+              @api.resource(:organizations)\
+                .call(:update, {
+                        'id' => organization_id,
+                        'organization' => {
+                          'config_template_ids' => template_organizations[organization_id]
+                        }
+                      })
+            end
+          end
+          template_locations ||= {}
+          locations.each do |location_id|
+            if template_locations[location_id].nil?
+              template_locations[location_id] = @api.resource(:locations)\
+                .call(:show, {
+                        'id' => location_id
+                      })['config_templates'].collect do |template|
+                template['id']
+              end
+            end
+            if !template_locations[location_id].include? template_id
+              template_locations[location_id] += [template_id]
+              @api.resource(:locations)\
+                .call(:update, {
+                        'id' => location_id,
+                        'location' => {
+                          'config_template_ids' => template_locations[location_id]
+                        }
+                      })
+            end
+          end
 
           print "done\n" if option_verbose?
         end

data/lib/hammer_cli_csv/roles.rb

@@ -59,9 +59,20 @@ module HammerCLICsv
       end
 
       def create_roles_from_csv(line)
+
+        permissions = collect_column(line[PERMISSIONS]) do |permission|
+          foreman_permission(:name => permission)
+        end
+        organizations = collect_column(line[ORGANIZATIONS]) do |organization|
+          foreman_organization(:name => organization)
+        end
+        locations = collect_column(line[LOCATIONS]) do |location|
+          foreman_location(:name => location)
+        end
+
         line[COUNT].to_i.times do |number|
           name = namify(line[NAME], number)
-          search = namify(line[SEARCH], number) if line[SEARCH]
+          search = line[SEARCH] ? namify(line[SEARCH], number) : nil
 
           if !@existing_roles[name]
             print "Creating role '#{name}'..." if option_verbose?
@@ -76,35 +87,29 @@ module HammerCLICsv
                                        })
           end
 
-          permissions = collect_column(line[PERMISSIONS]) do |permission|
-            foreman_permission(:name => permission)
-          end
-          organizations = collect_column(line[ORGANIZATIONS]) do |organization|
-            foreman_organization(:name => organization)
-          end
-          locations = collect_column(line[LOCATIONS]) do |location|
-            foreman_location(:name => location)
-          end
-
           filter_id = foreman_filter(name, line[RESOURCE], search)
           if !filter_id
-            print " creating filter #{line[RESOURCE]}..."
-            @api.resource(:filters).call(:create, {
-                                           'role_id' => @existing_roles[name],
-                                           'search' => search,
-                                           'organization_ids' => organizations,
-                                           'location_ids' => locations,
-                                           'permission_ids' => permissions
-                                         })
+            print " creating filter #{line[RESOURCE]}..." if option_verbose?
+            @api.resource(:filters)\
+              .call(:create, { 'filter' => {
+                        'role_id' => @existing_roles[name],
+                        'search' => search,
+                        'unlimited' => search.empty?,
+                        'organization_ids' => organizations,
+                        'location_ids' => locations,
+                        'permission_ids' => permissions
+                      }})
           else
             print " updating filter #{line[RESOURCE]}..."
-            @api.resource(:filters).call(:update, {
-                                           'id' => filter_id,
-                                           'search' => search,
-                                           'organization_ids' => organizations,
-                                           'location_ids' => locations,
-                                           'permission_ids' => permissions
-                                         })
+            @api.resource(:filters)\
+              .call(:update, {
+                      'id' => filter_id,
+                      'search' => search,
+                      'unlimited' => search.empty?,
+                      'organization_ids' => organizations,
+                      'location_ids' => locations,
+                      'permission_ids' => permissions
+                    })
           end
 
           puts 'done' if option_verbose?

data/lib/hammer_cli_csv/version.rb

@@ -11,6 +11,6 @@
 
 module HammerCLICsv
   def self.version
-    @version ||= Gem::Version.new('0.0.2')
+    @version ||= Gem::Version.new('0.0.4')
   end
 end

data/test/config.template.yml

@@ -1,3 +1,15 @@
+: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
+
 :csv:
   :enable_module: true
   :host:          'https://localhost'
@@ -12,6 +24,3 @@
 
 :katello:
   :enable_module: true
-  :host:          'https://localhost'
-  :username:      'admin'
-  :password:      'changeme'

data/test/csv_test_helper.rb

@@ -25,16 +25,15 @@ require 'hammer_cli_csv'
 require 'hammer_cli_foreman'
 require 'hammer_cli_katello'
 
-def ctx
-  {
-    :interactive => false,
-    :username => 'admin',
-    :password => 'changeme'
-  }
+module HammerCLIForeman
+  def self.clear_credentials
+    @credentials = nil
+  end
 end
 
+
 def hammer(context=nil)
-  HammerCLI::MainCommand.new("", context || ctx)
+  HammerCLI::MainCommand.new("", context || HammerCLI::Settings.dump)
 end
 
 def capture
@@ -50,12 +49,22 @@ ensure
 end
 
 def set_user(username, password='changeme')
+  HammerCLI::Connection.drop_all
+  HammerCLIForeman.clear_credentials
   HammerCLI::Settings.load({
-                             :_params => {
-                               :username => username,
-                               :password => password,
-                               :interactive => false
-                             }})
+                               :_params => {
+                                   :username => username,
+                                   :password => password
+                               },
+                               :foreman => {
+                                   :username => username,
+                                   :password => password
+                               },
+                               :csv => {
+                                   :username => username,
+                                   :password => password
+                               }
+                           })
 end
 
 

data/test/data/organizations.csv

@@ -1,4 +1,4 @@
-"Name","Count","Organization","Description"
+"Name","Count","Label","Description"
 "Mega Corporation","1","megacorp","The number one mega company in the world!"
 "Mega Subsidiary","1","subcorp","The number one subsidiary of the number one mega company in the world!"
 

data/test/data/roles.csv

@@ -15,6 +15,7 @@ chelseacalaway,1,ActivationKey,name = chelsea.calaway@megacorp.com,"view_activat
 cinthiacadieux,1,ActivationKey,name = cinthia.cadieux@megacorp.com,"view_activation_keys",Mega Corporation,
 coraleeculbert,1,ActivationKey,name = coralee.culbert@megacorp.com,"view_activation_keys",Mega Corporation,
 damondials,1,ActivationKey,name = damon.dials@megacorp.com,"view_activation_keys",Mega Corporation,
+damondials,1,Organization,"name = ""Mega Corporation""","view_organizations",,
 danaedrayer,1,ActivationKey,name = danae.drayer@megacorp.com,"view_activation_keys",Mega Corporation,
 danettedewitt,1,ActivationKey,name = danette.dewitt@megacorp.com,"view_activation_keys",Mega Corporation,
 danilodilbeck,1,ActivationKey,name = danilo.dilbeck@megacorp.com,"view_activation_keys",Mega Corporation,
@@ -45,7 +46,7 @@ hsiuhenningsen,1,ActivationKey,name = hsiu.henningsen@megacorp.com,"view_activat
 jacquesjoaquin,1,ActivationKey,name = jacques.joaquin@megacorp.com,"view_activation_keys",Mega Corporation,
 janayjohnson,1,ActivationKey,name = janay.johnson@megacorp.com,"view_activation_keys",Mega Corporation,
 jeffersonjock,1,ActivationKey,name = jefferson.jock@megacorp.com,"view_activation_keys",Mega Corporation,
-jeneejahns,1,ActivationKey,,"view_activation_keys,create_activation_keys,edit_activation_keys,destroy_activation_keys",Mega Corporation,
+jeneejahns,1,ActivationKey,name = jenee.jahns@megacorp.com,"view_activation_keys,create_activation_keys,edit_activation_keys,destroy_activation_keys",Mega Corporation,
 jeremyjong,1,ActivationKey,name = jeremy.jong@megacorp.com,"view_activation_keys",Mega Corporation,
 judithjoachim,1,ActivationKey,name = judith.joachim@megacorp.com,"view_activation_keys",Mega Corporation,
 juliojerabek,1,ActivationKey,name = julio.jerabek@megacorp.com,"view_activation_keys",Mega Corporation,
@@ -117,43 +118,43 @@ weswallner,1,ActivationKey,name = wes.wallner@megacorp.com,"view_activation_keys
 winifredwessels,1,ActivationKey,name = winifred.wessels@megacorp.com,"view_activation_keys",Mega Corporation,
 yunyarberry,1,ActivationKey,name = yun.yarberry@megacorp.com,"view_activation_keys",Mega Corporation,
 zelmazemke,1,ActivationKey,name = zelma.zemke@megacorp.com,"view_activation_keys",Mega Corporation,
-Mega Corporation Admin,1,ActivationKey,"","view_activation_keys,create_activation_keys,edit_activation_keys,destroy_activation_keys",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Architecture,"","view_architectures,create_architectures,edit_architectures,destroy_architectures",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Audit,"",view_audit_logs,Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Bookmark,"","view_bookmarks,create_bookmarks,edit_bookmarks,destroy_bookmarks",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,CommonParameter,"","view_globals,create_globals,edit_globals,destroy_globals",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,ComputeProfile,"","view_compute_profiles,create_compute_profiles,edit_compute_profiles,destroy_compute_profiles",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,ComputeResource,"","console_compute_resources_vms,power_compute_resources_vms,destroy_compute_resources_vms,edit_compute_resources_vms,create_compute_resources_vms,view_compute_resources_vms,destroy_compute_resources,edit_compute_resources,create_compute_resources,view_compute_resources",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,System,"","view_content_hosts,create_content_hosts,edit_content_hosts,destroy_content_hosts",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,ContentView,"","view_content_views,create_content_views,edit_content_views,destroy_content_views,publish_content_views",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Domain,"","view_domains,create_domains,edit_domains,destroy_domains",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Environment,"","view_environments,create_environments,edit_environments,destroy_environments,import_environments",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,FactValue,"","view_facts,upload_facts",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Filter,"","view_filters,create_filters,edit_filters,destroy_filters",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,GpgKey,"","view_gpg_keys,create_gpg_keys,edit_gpg_keys,destroy_gpg_keys",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Hostgroup,"","view_hostgroups,create_hostgroups,edit_hostgroups,destroy_hostgroups",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,HostClass,"",edit_classes,Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Host,"","puppetrun_hosts,ipmi_boot,console_hosts,power_hosts,build_hosts,destroy_hosts,edit_hosts,create_hosts,view_hosts",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Image,"","view_images,create_images,edit_images,destroy_images",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Location,"","view_locations,create_locations,edit_locations,destroy_locations,assign_locations",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,KTEnvironment,"","view_lifecycle_environments,create_lifecycle_environments,edit_lifecycle_environments,destroy_lifecycle_environments",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,LookupKey,"","view_external_variables,create_external_variables,edit_external_variables,destroy_external_variables",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Medium,"","view_media,create_media,edit_media,destroy_media",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Model,"","view_models,create_models,edit_models,destroy_models",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Operatingsystem,"","view_operatingsystems,create_operatingsystems,edit_operatingsystems,destroy_operatingsystems",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Organization,"","delete_manifest,import_manifest,unattach_subscriptions,attach_subscriptions,view_subscriptions,assign_organizations,edit_organizations,view_organizations",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Parameter,"","create_params,edit_params,destroy_params",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Ptable,"","view_ptables,create_ptables,edit_ptables,destroy_ptables",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Product,"","view_products,create_products,edit_products,destroy_products,sync_products",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,ConfigTemplate,"","view_templates,create_templates,edit_templates,destroy_templates,deploy_templates",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Puppetclass,"","view_puppetclasses,create_puppetclasses,edit_puppetclasses,destroy_puppetclasses,import_puppetclasses",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Realm,"","view_realms,create_realms,edit_realms,destroy_realms",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Report,"","view_reports,destroy_reports,upload_reports",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Role,"","view_roles,create_roles,edit_roles,destroy_roles",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,SmartProxy,"","destroy_smart_proxies_puppetca,edit_smart_proxies_puppetca,view_smart_proxies_puppetca,destroy_smart_proxies_autosign,create_smart_proxies_autosign,view_smart_proxies_autosign,destroy_smart_proxies,edit_smart_proxies,create_smart_proxies,view_smart_proxies",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Subnet,"","view_subnets,create_subnets,edit_subnets,destroy_subnets,import_subnets",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,SyncPlan,"","view_sync_plans,create_sync_plans,edit_sync_plans,destroy_sync_plans",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Trend,"","view_trends,create_trends,edit_trends,destroy_trends,edit_trends",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,User,"","view_users,create_users,edit_users,destroy_users",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,Usergroup,"","view_usergroups,create_usergroups,edit_usergroups,destroy_usergroups",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
-Mega Corporation Admin,1,,"","view_tasks,view_statistics,view_plugins,access_settings,access_dashboard",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default_Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,ActivationKey,"","view_activation_keys,create_activation_keys,edit_activation_keys,destroy_activation_keys",Mega Corporation,
+Mega Corporation Admin,1,Architecture,"","view_architectures,create_architectures,edit_architectures,destroy_architectures",,
+Mega Corporation Admin,1,Audit,"",view_audit_logs,,
+Mega Corporation Admin,1,Bookmark,"","view_bookmarks,create_bookmarks,edit_bookmarks,destroy_bookmarks",,
+Mega Corporation Admin,1,CommonParameter,"","view_globals,create_globals,edit_globals,destroy_globals",,
+Mega Corporation Admin,1,ComputeProfile,"","view_compute_profiles,create_compute_profiles,edit_compute_profiles,destroy_compute_profiles",,
+Mega Corporation Admin,1,ComputeResource,"","console_compute_resources_vms,power_compute_resources_vms,destroy_compute_resources_vms,edit_compute_resources_vms,create_compute_resources_vms,view_compute_resources_vms,destroy_compute_resources,edit_compute_resources,create_compute_resources,view_compute_resources",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,System,"","view_content_hosts,create_content_hosts,edit_content_hosts,destroy_content_hosts",Mega Corporation,
+Mega Corporation Admin,1,ContentView,"","view_content_views,create_content_views,edit_content_views,destroy_content_views,publish_content_views",Mega Corporation,
+Mega Corporation Admin,1,Domain,"","view_domains,create_domains,edit_domains,destroy_domains",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Environment,"","view_environments,create_environments,edit_environments,destroy_environments,import_environments",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,FactValue,"","view_facts,upload_facts",,
+Mega Corporation Admin,1,Filter,"","view_filters,create_filters,edit_filters,destroy_filters",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,GpgKey,"","view_gpg_keys,create_gpg_keys,edit_gpg_keys,destroy_gpg_keys",Mega Corporation,
+Mega Corporation Admin,1,Hostgroup,"","view_hostgroups,create_hostgroups,edit_hostgroups,destroy_hostgroups",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,HostClass,"",edit_classes,,
+Mega Corporation Admin,1,Host,"","puppetrun_hosts,ipmi_boot,console_hosts,power_hosts,build_hosts,destroy_hosts,edit_hosts,create_hosts,view_hosts",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Image,"","view_images,create_images,edit_images,destroy_images",,
+Mega Corporation Admin,1,Location,"","view_locations,create_locations,edit_locations,destroy_locations,assign_locations",,
+Mega Corporation Admin,1,KTEnvironment,"","view_lifecycle_environments,create_lifecycle_environments,edit_lifecycle_environments,destroy_lifecycle_environments",Mega Corporation,
+Mega Corporation Admin,1,LookupKey,"","view_external_variables,create_external_variables,edit_external_variables,destroy_external_variables",,
+Mega Corporation Admin,1,Medium,"","view_media,create_media,edit_media,destroy_media",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Model,"","view_models,create_models,edit_models,destroy_models",,
+Mega Corporation Admin,1,Operatingsystem,"","view_operatingsystems,create_operatingsystems,edit_operatingsystems,destroy_operatingsystems",,
+Mega Corporation Admin,1,Organization,"","delete_manifest,import_manifest,unattach_subscriptions,attach_subscriptions,view_subscriptions,assign_organizations,edit_organizations,view_organizations",,
+Mega Corporation Admin,1,Parameter,"","create_params,edit_params,destroy_params",,
+Mega Corporation Admin,1,Ptable,"","view_ptables,create_ptables,edit_ptables,destroy_ptables",,
+Mega Corporation Admin,1,Product,"","view_products,create_products,edit_products,destroy_products,sync_products",Mega Corporation,
+Mega Corporation Admin,1,ConfigTemplate,"","view_templates,create_templates,edit_templates,destroy_templates,deploy_templates",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Puppetclass,"","view_puppetclasses,create_puppetclasses,edit_puppetclasses,destroy_puppetclasses,import_puppetclasses",,
+Mega Corporation Admin,1,Realm,"","view_realms,create_realms,edit_realms,destroy_realms",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Report,"","view_reports,destroy_reports,upload_reports",,
+Mega Corporation Admin,1,Role,"","view_roles,create_roles,edit_roles,destroy_roles",,
+Mega Corporation Admin,1,SmartProxy,"","destroy_smart_proxies_puppetca,edit_smart_proxies_puppetca,view_smart_proxies_puppetca,destroy_smart_proxies_autosign,create_smart_proxies_autosign,view_smart_proxies_autosign,destroy_smart_proxies,edit_smart_proxies,create_smart_proxies,view_smart_proxies",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Subnet,"","view_subnets,create_subnets,edit_subnets,destroy_subnets,import_subnets",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,SyncPlan,"","view_sync_plans,create_sync_plans,edit_sync_plans,destroy_sync_plans",Mega Corporation,
+Mega Corporation Admin,1,Trend,"","view_trends,create_trends,edit_trends,destroy_trends,edit_trends",,
+Mega Corporation Admin,1,User,"","view_users,create_users,edit_users,destroy_users",Mega Corporation,"Asia Pacific,Asia Pacific (Singapore) Region,Asia Pacific (Sydney) Region,Asia Pacific (Tokyo) Region,Default Location,EU (Ireland) Region,South America (Sao Paulo) Region,US East (Northern Virginia) Region,US West (Northern California) Region,US West (Oregon) Region"
+Mega Corporation Admin,1,Usergroup,"","view_usergroups,create_usergroups,edit_usergroups,destroy_usergroups",,
+Mega Corporation Admin,1,,"","view_tasks,view_statistics,view_plugins,access_settings,access_dashboard",,

data/test/data/subscriptions.csv

@@ -1,5 +1,5 @@
 Name,Count,Organization,Manifest File,Content Set,Arch,Release
-MegaCorp,1,Mega Corporation,~/Downloads/megacorp.zip,
+MegaCorp,1,Mega Corporation,test/data/megacorp.zip,
 Red Hat Enterprise Linux Server,1,Mega Corporation,,Red Hat Enterprise Linux 6 Server (RPMs),x86_64,6Server
 Red Hat Enterprise Linux Server,1,Mega Corporation,,Red Hat Enterprise Linux 6 Server (RPMs),x86_64,6.1
 Red Hat Enterprise Linux Server,1,Mega Corporation,,Red Hat Enterprise Linux 6 Server (RPMs),x86_64,6.2

data/test/roles_test.rb

@@ -3,35 +3,51 @@ require File.join(File.dirname(__FILE__), 'csv_test_helper')
 require 'stringio'
 require 'tempfile'
 
-describe 'something' do
+describe 'roles tests' do
 
   extend CommandTestHelper
 
 
-  before :each do
-    HammerCLI::Settings.load_from_file 'test/config.yml'
-  end
+  #before :each do
+  #  HammerCLI::Settings.load_from_file 'test/config'
+  #end
+
+  context 'roles' do
+
+    it 'basic import' do
+      set_user 'admin'
+
+      rolename = "role#{rand(10000)}"
+
+      file = Tempfile.new('roles_test')
+      file.write("Name,Count,Resource,Search,Permissions,Organizations,Locations\n")
+      file.write("#{rolename},1,ActivationKey,name = key_name,view_activation_keys,Mega Corporation,\n")
+      file.rewind
 
-  context 'activation keys' do
 
-    # Expected output of the form:
-    # ID,Name,Consumed
-    # 1,damon.dials@megacorp.com,0 of Unlimited
-    it 'allows show' do
-      set_user 'damon.dials@megacorp.com'
+      stdout,stderr = capture {
+        hammer.run(%W{csv roles --verbose --csv-file #{file.path}})
+      }
+      stderr.must_equal ''
+      stdout[0..-2].must_equal "Creating role '#{rolename}'... creating filter ActivationKey...done"
+      file.unlink
+    end
+
+    it 'test role functionality' do
+      set_user('damon.dials@megacorp.com', 'redhat')
 
       stdout,stderr = capture {
-        hammer.run(%W{activation-key list --organization-id megacorp}).must_equal HammerCLI::EX_OK
+        hammer.run(%W{activation-key list --organization-label megacorp}).must_equal HammerCLI::EX_OK
       }
       lines = stdout.split("\n")
-      lines.length.must_equal 2
-      lines[1].must_match /.*damon.dials@megacorp\.com.*/
+      lines.length.must_equal 5
+      lines[3].must_match /.*damon.dials@megacorp\.com.*/
 
-      id = lines[1].split(',')[0]
+      id = lines[3].split(' ')[0]
       stdout,stderr = capture {
         hammer.run(%W{activation-key info --id #{id}}).must_equal HammerCLI::EX_OK
       }
-      stdout.split("\n")[1].must_match /.*damon.dials@megacorp.com,[0-9]+,Individual account,Library,Default Organization View/
+      stdout.split("\n")[0].must_match /.*damon.dials@megacorp.com/
     end
 
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom McKay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_katello
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.24.1
 description: Hammer-CLI-CSV is a plugin for Hammer to provide bulk actions against
   a Katello server.
 email:
@@ -58,6 +58,8 @@ files:
 - lib/hammer_cli_csv/csv.rb
 - lib/hammer_cli_csv/domains.rb
 - lib/hammer_cli_csv/exception_handler.rb
+- lib/hammer_cli_csv/export.rb
+- lib/hammer_cli_csv/headpin_api.rb
 - lib/hammer_cli_csv/host_collections.rb
 - lib/hammer_cli_csv/hosts.rb
 - lib/hammer_cli_csv/import.rb