hammer_cli_import 0.10.23 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a49f9fd808fe88a5293f365ee77494e9f9a04a0
-  data.tar.gz: c1c86671d4c244ba77df04e81f503829f0ecfb4d
+  metadata.gz: c08a194170bc35a88e652f6daefef5f69847dbe0
+  data.tar.gz: b12ebf8a2bac1da4b3d948a41300470b390ece1c
 SHA512:
-  metadata.gz: 680c4f81cc797422e99a8ad83187cb02f197a2662d13e7ab2f0adbf8b2f624a4015854b9021b45763f7c6d4f582531aa75ad4469bbce01eab42f451fabe3bd13
-  data.tar.gz: 0b2fe41e6805f56e67244c73de64fb2a8cd205d3b35df61d57fcc4a1ad03848805c5cef9ba4d5174d7577b9dd9977109b37613fc3035dee26d89fbbef99f64eb
+  metadata.gz: d7c620cd561928849d516dd8483fd59ef98f83460f0f1c5f870a834e46a9ce00d722b2583d5de7e6a2446382fb7614a0dfae1b250c38ef636d1fc17f8e47456d
+  data.tar.gz: 3cdf57fcb72980362f136d6eec0d9aa4d2c9afa0cfeb29c74b517e59139e403bce06957e24c8175983675859cf6dd889a9ff6d2e53ecef5004f14a14ae184092

data/lib/hammer_cli_import/base.rb

@@ -75,6 +75,22 @@ module HammerCLIImport
       @summary = {}
       # Initialize AsyncTaskReactor
       atr_init
+
+      server = (HammerCLI::Settings.settings[:_params] &&
+                 HammerCLI::Settings.settings[:_params][:host]) ||
+        HammerCLI::Settings.get(:foreman, :host)
+      username = (HammerCLI::Settings.settings[:_params] &&
+                   HammerCLI::Settings.settings[:_params][:username]) ||
+        HammerCLI::Settings.get(:foreman, :username)
+      password = (HammerCLI::Settings.settings[:_params] &&
+                  HammerCLI::Settings.settings[:_params][:password]) ||
+        HammerCLI::Settings.get(:foreman, :password)
+      @api = ApipieBindings::API.new({
+                                       :uri => server,
+                                       :username => username,
+                                       :password => password,
+                                       :api_version => 2
+                                     })
     end
 
     # What spacewalk-report do we expect to use for a given subcommand
@@ -427,13 +443,29 @@ module HammerCLIImport
         return get_cache(entity_type)[@pm[entity_type][original_id]]
       else
         info 'Creating new ' + type + ': ' + entity_hash.values_at(:name, :label, :login).compact[0]
-        entity_hash = {@wrap_out[entity_type] => entity_hash} if @wrap_out[entity_type]
-        debug "entity_hash: #{entity_hash.inspect}"
-        entity = mapped_api_call(entity_type, :create, entity_hash)
+        if entity_type == :systems
+          entity = @api.resource(:host_subscriptions).call(:create, entity_hash)
+          params = {
+            'id' => entity['id'],
+            'host' => {
+              'comment' => entity_hash[:description]
+            }
+          }
+          @api.resource(:hosts).call(:update, params)
+          unless entity_hash[:host_collection_ids].empty?
+            @api.resource(:host_collections).call(:add_hosts, {
+                'id' => entity_hash[:host_collection_ids][0],
+                'host_ids' => [entity['id']]
+            })
+          end
+          entity['id'] = entity['id'].to_s
+        else
+          entity_hash = {@wrap_out[entity_type] => entity_hash} if @wrap_out[entity_type]
+          debug "entity_hash: #{entity_hash.inspect}"
+          entity = mapped_api_call(entity_type, :create, entity_hash)
+        end
         debug "created entity: #{entity.inspect}"
         entity = entity[@wrap_in[entity_type]] if @wrap_in[entity_type]
-        # workaround for Bug
-        entity['id'] = entity['uuid'] if entity_type == :systems
         @pm[entity_type][original_id] = entity['id']
         get_cache(entity_type)[entity['id']] = entity
         debug "@pm[#{entity_type}]: #{@pm[entity_type].inspect}"

data/lib/hammer_cli_import/configfile.rb

@@ -136,39 +136,52 @@ module HammerCLIImport
       # inside of working-directory
       def generate_module_template_for(name)
         module_name = name
+        pwd = Dir.pwd
         Dir.chdir(option_working_directory)
         gen_cmd = "puppet module generate #{name}"
         Open3.popen3(gen_cmd) do |stdin, stdout, _stderr|
-          stdout.sync = true
-          ConfigFileImportCommand.interview_questions.each do |q|
-            rd = ''
-            until rd.include? '?'
-              rd = stdout.readline
-              #debug "Read #{rd}"
+          begin
+            stdout.sync = true
+            ConfigFileImportCommand.interview_questions.each do |q|
+              rd = ''
+              until rd.include? '?'
+                rd = stdout.readline
+                debug "Read #{rd}"
+              end
+              answer = @interview_answers[q].gsub('#{module_name}', module_name)
+              stdin.puts(answer)
             end
-            answer = @interview_answers[q].gsub('#{module_name}', module_name)
-            stdin.puts(answer)
+          rescue EOFError => e
+            debug 'Done reading'
+            break
           end
-          rd = ''
           begin
+            rd = ''
             rd = stdout.readline while rd
           rescue EOFError
             debug 'Done reading'
           end
         end
+        Dir.chdir(pwd)
 
         # Now that we have generated the module, add a 'description' to the
         # metadata.json file found at option_working_dir/<name>/metadata.json
         metadata_path = File.join(File.join(option_working_directory, name), 'metadata.json')
-        answer = @interview_answers['description'].gsub('#{module_name}', module_name)
-        sed_cmd = "sed -i '\/\"summary\":\/a \\ \\ \"description\": \"#{answer}\",' #{metadata_path}"
-        debug "About to issue #{sed_cmd}"
-        system sed_cmd
-        report_summary :wrote, :puppet_modules
+        if File.exist? metadata_path
+          answer = @interview_answers['description'].gsub('#{module_name}', module_name)
+          sed_cmd = "sed -i '\/\"summary\":\/a \\ \\ \"description\": \"#{answer}\",' #{metadata_path}"
+          debug "About to issue #{sed_cmd}"
+          system sed_cmd
+          report_summary :wrote, :puppet_modules
+        else
+          info "Failed puppet module #{name}: metadata.json not created"
+          report_summary :failed, :puppet_modules
+        end
       end
 
       def build_puppet_module(module_name)
         module_dir = File.join(option_working_directory, module_name)
+        return nil unless File.exist? module_dir
         Dir.chdir(module_dir)
         gen_cmd = 'puppet module build'
         Open3.popen3(gen_cmd) do |_stdin, stdout, _stderr|
@@ -284,10 +297,11 @@ module HammerCLIImport
       def export_files
         progress 'Writing converted files'
         @modules.each do |mname, files|
+          module_dir = File.join(option_working_directory, mname)
+          next unless File.exist? module_dir
           info "Found module #{mname}"
           dsl = ''
 
-          module_dir = File.join(option_working_directory, mname)
           fdir = File.join(module_dir, 'files')
           Dir.mkdir(fdir)
           tdir = File.join(module_dir, 'templates')
@@ -359,6 +373,7 @@ module HammerCLIImport
 
           # Build the puppet-module for upload
           module_dir = build_puppet_module(mname)
+          next if module_dir.nil?
 
           # Build/find the product
           product_hash = mk_product_hash(data, prod_name)
@@ -372,7 +387,7 @@ module HammerCLIImport
                                [data['org_id'].to_i, data['channel_id'].to_i])
 
           # Find the built-module .tar.gz
-          built_module_path = File.join(File.join(module_dir, 'pkg'),
+          built_module_path = File.join('pkg',
                                         "#{mname}-#{@interview_answers['version']}.tar.gz")
           info "Uploading #{built_module_path}"
 

data/lib/hammer_cli_import/contenthost.rb

@@ -25,6 +25,7 @@ module HammerCLIImport
   class ImportCommand
     class ContentHostImportCommand < BaseCommand
       include ImportTools::ContentView::Include
+      include ImportTools::LifecycleEnvironment::Include
 
       command_name 'content-host'
       reportname = 'system-profiles'
@@ -57,13 +58,14 @@ module HammerCLIImport
         hcollections = split_multival(data['system_group_id']).collect do |sg_id|
           get_translated_id(:host_collections, sg_id)
         end
+        org_id = get_translated_id(:organizations, data['organization_id'].to_i)
         {
           :name => data['profile_name'],
-          :description => "#{data['description']}\nsat5_system_id: #{data['server_id']}",
+          :comment => "#{data['description']}\nsat5_system_id: #{data['server_id']}",
           :facts => {'release' => data['release'], 'architecture' => data['architecture']},
-          :type => 'system',
           # :guest_ids => [],
-          :organization_id => get_translated_id(:organizations, data['organization_id'].to_i),
+          :organization_id => org_id,
+          :lifecycle_environment_id => get_env(org_id)['id'],
           :content_view_id => cv_id,
           :host_collection_ids => hcollections
         }
@@ -90,7 +92,7 @@ module HammerCLIImport
         # store processed system profiles to a set according to the organization
         @map << {
           :org_id => data['organization_id'].to_i,
-          :system_id => data['server_id'].to_i,
+          :host_id => data['server_id'].to_i,
           :uuid => c_host['uuid']}
         # associate virtual guests in post_import to make sure, all the guests
         # are already imported (and known to sat6)
@@ -157,10 +159,10 @@ module HammerCLIImport
           info "#{to_singular(:systems).capitalize} with id #{profile_id} wasn't imported. Skipping deletion."
           return
         end
-        profile = get_cache(:systems)[@pm[:systems][profile_id]]
+        profile = get_cache(:systems)[@pm[:hosts][profile_id]]
         cv = get_cache(:content_views)[profile['content_view_id']]
         @composite_cvs << cv['id'] if cv['composite']
-        delete_entity_by_import_id(:systems, get_translated_id(:systems, profile_id), 'uuid')
+        delete_entity_by_import_id(:systems, get_translated_id(:hosts, profile_id), 'uuid')
       end
 
       def post_delete(_file)

data/lib/hammer_cli_import/importtools.rb

@@ -162,7 +162,10 @@ module ImportTools
       end
 
       def create_composite_content_view(entity_type, org_id, cv_label, cv_description, cvs)
-        return nil if cvs.empty?
+        if cvs.empty?
+          return list_server_entities(:content_views,
+                                      {:organization_id => org_id, :name => "Default Organization View"})[0]['id']
+        end
         if cvs.size == 1
           return cvs.to_a[0]
         else

data/lib/hammer_cli_import/persistentmap.rb

@@ -56,7 +56,7 @@ module PersistentMap
                                             :content_views
       @definitions[:redhat_repositories] = [{'org_id' => Fixnum}, {'channel_id' => Fixnum}], ['sat6' => Fixnum],
                                            :repositories
-      @definitions[:systems] = ['sat5' => Fixnum], ['sat6' => String], :systems
+      @definitions[:systems] = ['sat5' => Fixnum], ['sat6' => String], :hosts
       @definitions[:template_snippets] = ['id' => Fixnum], ['sat6' => Fixnum], :config_templates
 
       @definitions.freeze

data/lib/hammer_cli_import/version.rb

@@ -19,7 +19,7 @@
 
 module HammerCLIImport
   def self.version
-    @version ||= Gem::Version.new('0.10.23')
+    @version ||= Gem::Version.new('0.11.0')
   end
 end
 # vim: autoindent tabstop=2 shiftwidth=2 expandtab softtabstop=2 filetype=ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_import
 version: !ruby/object:Gem::Version
-  version: 0.10.23
+  version: 0.11.0
 platform: ruby
 authors:
 - "@mkollar"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -110,8 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Red Hat Satellite 5 data Importer commands for Hammer
 test_files: []
+has_rdoc: