seiso-import_master 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA3MTk0YTNlYzIxMDM3MzhlNTMwYWFhMGRiNzVhODU5MmYyZDc2Ng==
+    ZjFmMWVjMjM0ZTkwMjUyMGMyOWNhODJlZGEwYTlkM2E1MTFlNjJmMA==
   data.tar.gz: !binary |-
-    ZGE0MjU4OGIxNWRlYjQyZGY1N2Y5NzMwYjZkOTRlNDg1YzUyOGQ2Mg==
+    MmRkMmRlMzE4YzM5MmVmZDFjMGQ0NDI4MTk5NTU3NDAzMDBjNTFmMA==
 SHA512:
   metadata.gz: !binary |-
-    NWY0MGZkYjRkYzA1MTNlMDE3NzM1ZDBmM2RiZGE5NDZlY2JlYTY0Yzc2YWIz
-    YTliN2E4YjQ0ODYyMzY3MjFkNWE1ZDk0MGI2NjM4YzM1ODk5Yjc0MGRlMjU5
-    MmMxODkzYWZjNzVhNGY0ZmJhMTY0NWUyYTYxZTc0OWQzMzA4MGI=
+    ZDBhMGUwOGVlMzdlZDZjYTc0N2M1YzgxNmEzYTVkMmM2OTc0ZGNkNjhkYmYw
+    M2RhM2Q1ZDJiOTMyNGVhZmMwYTBiYTdkZTYzOTViYmMyNGYyNTk5YTZkZGNl
+    NjRhYWU3NDY3MGYwYTJjMGFkNmM4MTBhODBhYjJkZjkyY2JkOWU=
   data.tar.gz: !binary |-
-    ZjI2MjlhNzIzNWY2NTIzNmY3Y2VhMTlhYTI4ODE2NjRjYjM0MGRiZjRmMzRh
-    NTVlMTBmMDZmMjkwZjA0Y2NjMTgxOTJiM2M3ZDZhZWM0ZTQxMjdlYzI4NTI5
-    ZGRlNzJjOTAwZmUxMjliNzU4ZmI4ODhmYzllNGEzNzY0MGJjYTM=
+    YjczZjBjYTE0Y2Q4NTU1OTRjMmJlMjcxMDc0YzZhMmIwY2I1MmNlYTBkNGJk
+    YzE0OTlmMjA2N2NkOWMzYzViODM2OWRhYjJiZmMwNzU1ZDg0ZTkzNjBjZmVl
+    OTIyYTdiZDY3MGM0OGQ2NWRhM2E1YTdkNzZiYmQ5ZmU2MDRhZmU=

data/lib/seiso/import_master/importers/node_importer.rb

@@ -41,8 +41,7 @@ module Seiso
           nodes_uri = @uri_factory_v1.nodes_uri true
           @rest_connector_v1.post(nodes_uri, seiso_nodes)
 
-#          import_nips_slowly_without_keepalive nips
-          import_nips_quickly_with_keepalive nips
+          import_nips nips
         end
 
         private
@@ -52,17 +51,7 @@ module Seiso
 #          puts "TODO Delete stale nodes from seiso"
         end
 
-        def import_nips_slowly_without_keepalive(nips)
-          seiso_nips = nips.map { |nip| @mapper.seiso_nip nip }
-          seiso_nips.each do |nip|
-            node_name = nip['node']['name']
-            ip_address = nip['ipAddress']
-            nip_uri = @uri_factory_v1.node_ip_address_uri(node_name, ip_address)
-            @rest_connector_v1.put(nip_uri, nip)
-          end
-        end
-
-        def import_nips_quickly_with_keepalive(nips)
+        def import_nips(nips)
           seiso_nip_pairs = nips.map do |nip|
             node_name = nip['node']
             ip_address = nip['ipAddress']
@@ -71,6 +60,7 @@ module Seiso
               "resource" => @mapper.seiso_nip(nip)
             }
           end
+          # Uses keepalive
           @rest_connector_v1.put_all seiso_nip_pairs
         end
       end

data/lib/seiso/import_master/mappers/master_item_mapper.rb

@@ -91,6 +91,7 @@ module Seiso
             {
               'key' => hs['key'],
               'name' => hs['name'],
+              'description' => hs['description'],
               'statusType' => { 'key' => hs['statusType'] }
             }
           }
@@ -152,6 +153,7 @@ module Seiso
             {
               'key' => rs['key'],
               'name' => rs['name'],
+              'description' => rs['description'],
               'statusType' => { 'key' => rs['statusType'] }
             }
           }
@@ -161,7 +163,8 @@ module Seiso
           ->(sg) {
             {
               'key' => sg['key'],
-              'name' => sg['name']
+              'name' => sg['name'],
+              'description' => sg['description']
             }
           }
         end
@@ -170,7 +173,8 @@ module Seiso
           ->(st) {
             {
               'key' => st['key'],
-              'name' => st['name']
+              'name' => st['name'],
+              'description' => st['description']
             }
           }
         end
@@ -179,7 +183,8 @@ module Seiso
           ->(st) {
             {
               'key' => st['key'],
-              'name' => st['name']
+              'name' => st['name'],
+              'description' => st['description']
             }
           }
         end

data/seiso-import_master.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "seiso-import_master"
-  spec.version       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Imports Seiso data master files into Seiso."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler