Project

General

Profile

Revision bfc065ce

Added by Thomas McKay over 8 years ago

roles-test - wip

roles-test - users now get roles, orgs, and locations

View differences:

lib/hammer_cli_csv/activation_keys.rb
100 100
        @existing[line[ORGANIZATION]] = {}
101 101
        @k_activationkey_api.index({
102 102
                                     'per_page' => 999999,
103
                                     'organization_id' => line[ORGANIZATION]
103
                                     'organization_id' => katello_organization(:name => line[ORGANIZATION])
104 104
                                   })[0]['results'].each do |activationkey|
105 105
          @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id'] if activationkey
106 106
        end
......
121 121
                                    })[0]
122 122
          @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id']
123 123
        else
124
          print "Updating activationkey '#{name}'..." if option_verbose?
124
          print "Updating activation key '#{name}'..." if option_verbose?
125 125
          activationkey = @k_activationkey_api.update({
126 126
                                        'id' => @existing[line[ORGANIZATION]][name],
127 127
                                        'name' => name,

Also available in: Unified diff