hammer_cli_import 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535c3801fe4426f24078c54a8027d07769f70a2c
-  data.tar.gz: 42113b0cfeb57eee58ddf497f37bd2c36b2b378c
+  metadata.gz: 2024b364e195c834b54c4f222e41a4bf112a030e
+  data.tar.gz: 6f31847618212064183447dddcb4647e7dbc9604
 SHA512:
-  metadata.gz: 128610b346474cdd5903a9c052b872e8e93ae409c323befc0dadfa536cdd2f7927e672c0653b3edd83122047ed796dfce4dbc1a3985856c2a39801afc546d678
-  data.tar.gz: 12aeaeecfac173ae36bd21cbb9b5355f2775409dd66dc84fd8bf966b504477136be895616d257b91cadab976c60286905cbeb382776a6fe30d34607874ceb418
+  metadata.gz: f60431b8922f66724f13ce9586518b044bc6d1107af24f40b0e9a0f1c649870ba166b3111ac6029e9eb48c2fd7ad50d9ed14434e4a37bcad14dbb3a4264b2d84
+  data.tar.gz: a6e943876bb2b3fc8ea5662febadf678d89aeb24e3154ec3c3e1637bc8830fd2f47edbc68e422964b37a1b48a53a3475d5c272f86b30d082c6498c2b8d2e19cb

data/lib/hammer_cli_import/base.rb

@@ -62,7 +62,7 @@ module HammerCLIImport
         :products => :organizations,
         :repositories => :organizations,
         :repository_sets => :products,
-        :systems => :organizations
+        :hosts => :organizations
       }
       # cache imported objects (created/lookuped)
       @cache = {}
@@ -338,7 +338,7 @@ module HammerCLIImport
       end
 
       results.each do |entity|
-        entity['id'] = entity['uuid'] if entity_type == :systems
+        entity['id'] = entity['id'].to_s if entity_type == :hosts
         @cache[entity_type][entity['id']] = entity
       end
     end
@@ -443,7 +443,7 @@ 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]
-        if entity_type == :systems
+        if entity_type == :hosts
           entity = @api.resource(:host_subscriptions).call(:create, entity_hash)
           params = {
             'id' => entity['id'],
@@ -451,7 +451,7 @@ module HammerCLIImport
               'comment' => entity_hash[:description]
             }
           }
-          @api.resource(:hosts).call(:update, params)
+          entity = @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],

data/lib/hammer_cli_import/contenthost.rb

@@ -38,7 +38,7 @@ module HammerCLIImport
                   'base_channel_label'
 
       persistent_maps :organizations, :content_views, :redhat_content_views, :system_content_views,
-                      :host_collections, :systems
+                      :host_collections, :hosts
 
       option ['--export-directory'], 'DIR_PATH', 'Directory to export rpmbuild structure'
 
@@ -88,12 +88,14 @@ module HammerCLIImport
           'Composite content view for content hosts',
           cvs)
         profile = mk_profile_hash data, cv_id
-        c_host = create_entity(:systems, profile, data['server_id'].to_i)
+        c_host = create_entity(:hosts, profile, data['server_id'].to_i)
         # store processed system profiles to a set according to the organization
         @map << {
           :org_id => data['organization_id'].to_i,
-          :host_id => data['server_id'].to_i,
-          :uuid => c_host['uuid']}
+          :system_id => data['server_id'].to_i,
+          :host_id => c_host['id'],
+          :uuid => c_host['subscription_facet_attributes']['uuid']
+        }
         # associate virtual guests in post_import to make sure, all the guests
         # are already imported (and known to sat6)
         @vguests[data['server_id'].to_i] = split_multival(data['virtual_guest']) if data['virtual_host'] == data['server_id']
@@ -103,13 +105,13 @@ module HammerCLIImport
       def post_import(_file)
         @vguests.each do |system_id, guest_ids|
           handle_missing_and_supress "setting guests for #{system_id}" do
-            uuid = get_translated_id(:systems, system_id)
+            uuid = get_translated_id(:hosts, system_id)
             vguest_uuids = guest_ids.collect do |id|
-              get_translated_id(:systems, id)
+              get_translated_id(:hosts, id)
             end if guest_ids
             debug "Setting virtual guests for #{uuid}: #{vguest_uuids.inspect}"
             update_entity(
-              :systems,
+              :hosts,
               uuid,
               {:guest_ids => vguest_uuids}
             ) if uuid && vguest_uuids
@@ -155,14 +157,14 @@ module HammerCLIImport
       def delete_single_row(data)
         @composite_cvs ||= Set.new
         profile_id = data['server_id'].to_i
-        unless @pm[:systems][profile_id]
-          info "#{to_singular(:systems).capitalize} with id #{profile_id} wasn't imported. Skipping deletion."
+        unless @pm[:hosts][profile_id]
+          info "#{to_singular(:hosts).capitalize} with id #{profile_id} wasn't imported. Skipping deletion."
           return
         end
-        profile = get_cache(:systems)[@pm[:hosts][profile_id]]
+        profile = get_cache(:hosts)[@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(:hosts, profile_id), 'uuid')
+        @composite_cvs << cv['id'] if cv && cv['composite']
+        delete_entity_by_import_id(:hosts, get_translated_id(:hosts, profile_id), 'id')
       end
 
       def post_delete(_file)

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], :hosts
+      @definitions[:hosts] = ['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.11.1')
+    @version ||= Gem::Version.new('0.11.2')
   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.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - "@mkollar"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli