hammer_cli_csv 0.0.6 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRiMTE4MzU5Y2ZmMTI3NDM2MGQ4OWZhNWM5M2RiODIyYmI4OWMyOQ==
+    ZTZmY2U4MTYyOGVjYjU0ZDNmMTg3ZjA4ODY4NDFlYjQzNWJmZDA0OQ==
   data.tar.gz: !binary |-
-    ZDc0MTdjMjliZDk4NTMyODZhNmFkYjhjN2M1NmM2OGY4NTlkMDczNw==
+    YzNlNDUwZDIyZTk4ODA3MTUwOWRhNTY1NGJkNGVlN2U2N2U5MWY5Mg==
 SHA512:
   metadata.gz: !binary |-
-    YzIzNzhkYjE5OWJmZjQyNGRkZDJhNTExY2I0YWYxMWE5NWI2YWIxODA1MjIx
-    ODkwNDNiYWM5NjczZjY3NTlmMzlhNTJkN2ExOTllNmQ3Y2MxNWY0OWVmYTE4
-    ZTY3YWEwOGFkNmYzMjJlNTMyYjFiZjI0NGY2ZDk4YjA1NTQ3YzQ=
+    MThjNzUwYTg4NDJjOTNlZDQzZjUxMjQyNTJmMDVmM2FmOGI3ZjFlYmJmZTMw
+    MWYzZWI2ZjNlYWNmNTA0MjI4NmMyYjc0ZTIxMDFhOWJhMTU2ODBkOTRjNzZm
+    NDIzYzUzMmJmZTc3NDUwNTZkM2ZkZWZmNzJlZDhhZjgwMjNkN2Y=
   data.tar.gz: !binary |-
-    ZWM4ODcwZTdmOGE2OTVkYTgyOWYxMzAxODI3ZmRjYTVjZmFmMGFjYzg4OWUw
-    ZWI4YmMzYmRhNTg1MDI1OWVkOTcwMTk4YjVkM2Y5N2NkOWUzNWY1MTRjMzlk
-    NDBmMmUxNGFlMTVjY2ViMDA5OTgxNTEyY2RkNzVhMzg1YjIzNDY=
+    ZjM0MWExNTUyOWU5MmY3NGUwM2YzYTVmZDVhZmNjNDg0MzUyNTdlYWE1ZjU1
+    NTc3NDU2YWFmOTllMjMwODVhOGIwOGQ3NTAyODQwNjA5NzgwYjNkMjYyMTll
+    MzU5OTlkZjJmOTRkZWJmMWQ4ZGNiMTEwMGQzNmZhNGIxNWI5OGM=

data/lib/hammer_cli_csv/activation_keys.rb

@@ -20,17 +20,16 @@ module HammerCLICsv
       LIMIT = 'Limit'
       ENVIRONMENT = 'Environment'
       CONTENTVIEW = 'Content View'
-      SYSTEMGROUPS = 'System Groups'
+      HOSTCOLLECTIONS = 'System Groups'
       SUBSCRIPTIONS = 'Subscriptions'
 
       def export
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
           csv << [NAME, COUNT, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
-                  SYSTEMGROUPS, SUBSCRIPTIONS]
+                  HOSTCOLLECTIONS, SUBSCRIPTIONS]
           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']
@@ -52,20 +51,17 @@ module HammerCLICsv
               end
             end
           else
-            @api.resource(:organizations)\
-              .call(:index, {
-                      :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?
+            @api.resource(:organizations).call(:index, {
+                :per_page => 999999
+            })['results'].each do |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['usage_limit'].to_i < 0 ? 'Unlimited' : sytemgroup['usage_limit']
+                limit = activationkey['usage_limit'].to_i < 0 ? 'Unlimited' : activationkey['usage_limit']
                 environment = activationkey['environment']['label']
                 contentview = activationkey['content_view']['name']
                 hostcollections = export_column(activationkey, 'systemGroups', 'name')
@@ -97,11 +93,10 @@ module HammerCLICsv
       def create_activationkeys_from_csv(line)
         if !@existing[line[ORGANIZATION]]
           @existing[line[ORGANIZATION]] = {}
-          @api.resource(:activation_keys)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'organization_id' => foreman_organization(:name => line[ORGANIZATION])
-                  })['results'].each do |activationkey|
+          @api.resource(:activation_keys).call(:index, {
+              'per_page' => 999999,
+              'organization_id' => foreman_organization(:name => line[ORGANIZATION])
+          })['results'].each do |activationkey|
             @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id'] if activationkey
           end
         end
@@ -111,30 +106,30 @@ module HammerCLICsv
 
           if !@existing[line[ORGANIZATION]].include? name
             print "Creating activation key '#{name}'..." if option_verbose?
-            activationkey = @api.resource(:activation_keys)\
-              .call(:create, {
-                      'name' => name,
-                      'environment_id' => lifecycle_environment(line[ORGANIZATION],
-                                                                :name => line[ENVIRONMENT]),
-                      'content_view_id' => katello_contentview(line[ORGANIZATION],
-                                                               :name => line[CONTENTVIEW]),
-                      'description' => line[DESCRIPTION],
-                      'usage_limit' => usage_limit(line[LIMIT])
-                    })
+            activationkey = @api.resource(:activation_keys).call(:create, {
+                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                'name' => name,
+                'environment_id' => lifecycle_environment(line[ORGANIZATION],
+                                                          :name => line[ENVIRONMENT]),
+                'content_view_id' => katello_contentview(line[ORGANIZATION],
+                                                         :name => line[CONTENTVIEW]),
+                'description' => line[DESCRIPTION],
+                'usage_limit' => usage_limit(line[LIMIT])
+            })
             @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id']
           else
             print "Updating activation key '#{name}'..." if option_verbose?
-            activationkey = @api.resource(:activation_keys)\
-              .call(:update, {
-                      'id' => @existing[line[ORGANIZATION]][name],
-                      'name' => name,
-                      'environment_id' => lifecycle_environment(line[ORGANIZATION],
-                                                                :name => line[ENVIRONMENT]),
-                      'content_view_id' => katello_contentview(line[ORGANIZATION],
-                                                               :name => line[CONTENTVIEW]),
-                      'description' => line[DESCRIPTION],
-                      'usage_limit' => usage_limit(line[LIMIT])
-                    })
+            activationkey = @api.resource(:activation_keys).call(:update, {
+                'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                'id' => @existing[line[ORGANIZATION]][name],
+                'name' => name,
+                'environment_id' => lifecycle_environment(line[ORGANIZATION],
+                                                          :name => line[ENVIRONMENT]),
+                'content_view_id' => katello_contentview(line[ORGANIZATION],
+                                                         :name => line[CONTENTVIEW]),
+                'description' => line[DESCRIPTION],
+                'usage_limit' => usage_limit(line[LIMIT])
+            })
 
             update_subscriptions(activationkey, line)
             update_groups(activationkey, line)
@@ -145,14 +140,13 @@ module HammerCLICsv
       end
 
       def update_groups(activationkey, line)
-        if line[SYSTEMGROUPS] && line[SYSTEMGROUPS] != ''
+        if line[HOSTCOLLECTIONS] && line[HOSTCOLLECTIONS] != ''
           # TODO: note that existing system groups are not removed
-          CSV.parse_line(line[SYSTEMGROUPS], {:skip_blanks => true}).each do |name|
-            @api.resource(:host_collections)\
-              .call(:add_activation_keys, {
-                      'id' => katello_hostcollection(line[ORGANIZATION], :name => name),
-                      'activation_key_ids' => [activationkey['id']]
-                    })
+          CSV.parse_line(line[HOSTCOLLECTIONS], {:skip_blanks => true}).each do |name|
+            @api.resource(:host_collections).call(:add_activation_keys, {
+                'id' => katello_hostcollection(line[ORGANIZATION], :name => name),
+                'activation_key_ids' => [activationkey['id']]
+            })
           end
         end
       end
@@ -160,31 +154,29 @@ module HammerCLICsv
       def update_subscriptions(activationkey, line)
         if line[SUBSCRIPTIONS] && line[SUBSCRIPTIONS] != ''
           subscriptions = CSV.parse_line(line[SUBSCRIPTIONS], {:skip_blanks => true}).collect do |subscription_details|
-            (amount, name) = subscription_details.split('|')
+            (amount, sku, name) = subscription_details.split('|')
             {
               :id => katello_subscription(line[ORGANIZATION], :name => name),
-              :quantity => amount
+              :quantity => (amount.nil? || amount == 'Automatic') ? 0 : amount
             }
           end
 
-          # TODO: should there be a destroy_all similar to systems?
-          @api.resource(:subscriptions)\
-            .call(:index, {
-                    'per_page' => 999999,
-                    'activation_key_id' => activationkey['id']
-                  })['results'].each do |subscription|
-            @api.resource(:subscriptions)\
-              .call(:destroy, {
-                      'id' => subscription['id'],
-                      'activation_key_id' => activationkey['id']
-                    })
+          existing_subscriptions = @api.resource(:subscriptions).call(:index, {
+              'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+              'per_page' => 999999,
+              'activation_key_id' => activationkey['id']
+          })['results']
+          if existing_subscriptions.length > 0
+            @api.resource(:activation_keys).call(:remove_subscriptions, {
+              'id' => activationkey['id'],
+              'subscriptions' => existing_subscriptions
+            })
           end
 
-          @api.resource(:subscriptions)\
-            .call(:create, {
-                    'activation_key_id' => activationkey['id'],
-                    'subscriptions' => subscriptions
-                  })
+          @api.resource(:activation_keys).call(:add_subscriptions, {
+              'id' => activationkey['id'],
+              'subscriptions' => subscriptions
+          })
         end
       end
 

data/lib/hammer_cli_csv/base.rb

@@ -23,50 +23,37 @@ module HammerCLICsv
     option %w(--csv-export), :flag, 'Export current data instead of importing'
     option %w(--csv-file), 'FILE_NAME', 'CSV file (default to /dev/stdout with --csv-export, otherwise required)'
     option %w(--prefix), 'PREFIX', 'Prefix for all name columns'
-    option %w(--server), 'SERVER', 'Server URL'
-    option %w(-u --username), 'USERNAME', 'Username to access server'
-    option %w(-p --password), 'PASSWORD', 'Password to access server'
 
     NAME = 'Name'
     COUNT = 'Count'
 
     def execute
-      if !option_csv_file
-        if option_csv_export?
-          # rubocop:disable UselessAssignment
-          option_csv_file = '/dev/stdout'
-        else
-          # rubocop:disable UselessAssignment
-          option_csv_file = '/dev/stdin'
-        end
-      end
-
-      server = option_server ||
+      @server = HammerCLI::Settings.settings[:_params][:host] ||
         HammerCLI::Settings.get(:csv, :host) ||
         HammerCLI::Settings.get(:katello, :host) ||
         HammerCLI::Settings.get(:foreman, :host)
-      username = option_username ||
+      @username = HammerCLI::Settings.settings[:_params][:username] ||
         HammerCLI::Settings.get(:csv, :username) ||
         HammerCLI::Settings.get(:katello, :username) ||
         HammerCLI::Settings.get(:foreman, :username)
-      password = option_password ||
+      @password = HammerCLI::Settings.settings[:_params][:password] ||
         HammerCLI::Settings.get(:csv, :password) ||
         HammerCLI::Settings.get(:katello, :password) ||
         HammerCLI::Settings.get(:foreman, :password)
 
-      @server_status = check_server_status
+      @server_status = check_server_status(@server, @username, @password)
 
       if @server_status['release'] == 'Headpin'
         @headpin = HeadpinApi.new({
-                                    :server => server,
-                                    :username => username,
-                                    :password => password
+                                    :server => @server,
+                                    :username => @username,
+                                    :password => @password
                                   })
       else
         @api = ApipieBindings::API.new({
-                                         :uri => server,
-                                         :username => username,
-                                         :password => password,
+                                         :uri => @server,
+                                         :username => @username,
+                                         :password => @password,
                                          :api_version => 2
                                        })
       end
@@ -75,10 +62,7 @@ module HammerCLICsv
       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)
+    def check_server_status(server, username, password)
       url = "#{server}/api/status"
       uri = URI(url)
       nethttp = Net::HTTP.new(uri.host, uri.port)
@@ -492,11 +476,10 @@ module HammerCLICsv
         return nil if options[:name].nil? || options[:name].empty?
         options[:id] = @lifecycle_environments[organization][options[:name]]
         if !options[:id]
-          @api.resource(:lifecycle_environments)\
-            .call(:index, {
-                    :per_page => 999999,
-                    'organization_id' => foreman_organization(:name => organization)
-                  })['results'].each do |environment|
+          @api.resource(:lifecycle_environments).call(:index, {
+              :per_page => 999999,
+              'organization_id' => foreman_organization(:name => organization)
+          })['results'].each do |environment|
             @lifecycle_environments[organization][environment['name']] = environment['id']
           end
           options[:id] = @lifecycle_environments[organization][options[:name]]
@@ -527,9 +510,9 @@ module HammerCLICsv
         options[:id] = @contentviews[organization][options[:name]]
         if !options[:id]
           @api.resource(:content_views).call(:index, {
-                                               :per_page => 999999,
-                                               'organization_id' => foreman_organization(:name => organization)
-                                             })['results'].each do |contentview|
+              :per_page => 999999,
+              'organization_id' => foreman_organization(:name => organization)
+          })['results'].each do |contentview|
             @contentviews[organization][contentview['name']] = contentview['id']
           end
           options[:id] = @contentviews[organization][options[:name]]
@@ -551,6 +534,30 @@ module HammerCLICsv
       result
     end
 
+    def katello_contentviewversion(organization, name, version)
+      @contentviewversions ||= {}
+      @contentviewversions[organization] ||= {}
+      versionname = "#{version}|#{name}"
+
+      return nil if name.nil? || name.empty?
+      id = @contentviewversions[organization][versionname]
+      if !id
+        contentview_id = katello_contentview(organization, :name => name)
+        @api.resource(:content_view_versions).call(:index, {
+            :per_page => 999999,
+            'content_view_id' => contentview_id
+        })['results'].each do |contentviewversion|
+          if contentviewversion['version'] == version.to_i
+            @contentviewversions[organization][versionname] = contentviewversion['id']
+          end
+        end
+        id = @contentviewversions[organization][versionname]
+        raise "Content view version '#{name}' with version '#{version}' not found" if !id
+      end
+
+      id
+    end
+
     def katello_repository(organization, options = {})
       @repositories ||= {}
       @repositories[organization] ||= {}
@@ -559,11 +566,10 @@ module HammerCLICsv
         return nil if options[:name].nil? || options[:name].empty?
         options[:id] = @repositories[organization][options[:name]]
         if !options[:id]
-          @api.resource(:repositories)\
-            .call(:index, {
-                    :per_page => 999999,
-                    'organization_id' => foreman_organization(:name => organization)
-                  })['results'].each do |repository|
+          @api.resource(:repositories).call(:index, {
+              :per_page => 999999,
+              'organization_id' => foreman_organization(:name => organization)
+          })['results'].each do |repository|
             @repositories[organization][repository['name']] = repository['id']
           end
           options[:id] = @repositories[organization][options[:name]]
@@ -594,10 +600,10 @@ module HammerCLICsv
         options[:id] = @subscriptions[organization][options[:name]]
         if !options[:id]
           results = @api.resource(:subscriptions).call(:index, {
-                                                         :per_page => 999999,
-                                                         'organization_id' => foreman_organization(:name => organization),
-                                                         'search' => "name:\"#{options[:name]}\""
-                                                       })
+              :per_page => 999999,
+              'organization_id' => foreman_organization(:name => organization),
+              '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
           subscription = results['results'][0]
@@ -714,13 +720,12 @@ module HammerCLICsv
           end
         end
         associations[organization] += [id] if !associations[organization].include? id
-        @api.resource(:organizations)\
-          .call(:update, {
-                  'id' => organization_id,
-                  'organization' => {
-                    "#{name}_ids" => associations[organization]
-                  }
-                })
+        @api.resource(:organizations).call(:update, {
+            'id' => organization_id,
+            'organization' => {
+                "#{name}_ids" => associations[organization]
+            }
+        })
       end if organizations && !organizations.empty?
     end
 
@@ -737,13 +742,12 @@ module HammerCLICsv
         end
         associations[location] += [id] if !associations[location].include? id
 
-        @api.resource(:locations)\
-          .call(:update, {
-                  'id' => location_id,
-                  'location' => {
-                    "#{name}_ids" => associations[location]
-                  }
-                })
+        @api.resource(:locations).call(:update, {
+            'id' => location_id,
+            'location' => {
+                "#{name}_ids" => associations[location]
+            }
+        })
       end if locations && !locations.empty?
     end
   end

data/lib/hammer_cli_csv/compute_profiles.rb

@@ -61,23 +61,21 @@ module HammerCLICsv
           name = namify(line[NAME], number)
           if !@existing.include? name
             print "Creating compute profile '#{name}'..." if option_verbose?
-            id = @api.resource(:compute_profiles)\
-              .call(:create, {
-                      'compute_profile' => {
-                        'name' => name,
-                        'url' => line[URL]
-                      }
-                    })['id']
+            id = @api.resource(:compute_profiles).call(:create, {
+                'compute_profile' => {
+                    'name' => name,
+                    'url' => line[URL]
+                }
+            })['id']
           else
             print "Updating compute profile '#{name}'..." if option_verbose?
-            id = @api.resource(:compute_profiles)\
-              .call(:update, {
-                      'id' => @existing[name],
-                      'compute_profile' => {
-                        'name' => name,
-                        'url' => line[URL]
-                      }
-                    })['compute_profile']['id']
+            id = @api.resource(:compute_profiles).call(:update, {
+                'id' => @existing[name],
+                'compute_profile' => {
+                    'name' => name,
+                    'url' => line[URL]
+                }
+            })['compute_profile']['id']
           end
 
           # Update associated profiles

data/lib/hammer_cli_csv/compute_resources.rb

@@ -59,23 +59,21 @@ module HammerCLICsv
           name = namify(line[NAME], number)
           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, {
+                'compute_resource' => {
+                    'name' => name,
+                    'url' => line[URL]
+                }
+            })['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 = @api.resource(:compute_resources).call(:update, {
+                'id' => @existing[name],
+                'compute_resource' => {
+                    'name' => name,
+                    'url' => line[URL]
+                }
+            })['compute_resource']['id']
           end
 
           # Update associated resources