seiso-import_master 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTcxYjBhNzczYjI0YmEyMGRjYjQ5NjVmYWE5NzIzYWQyODhhOTc1Zg==
+    NjdmMzQyNjc3ZTI5YTdmNGM4MGUxZDA4NzYwOTU4YzhmNjBkY2RlYQ==
   data.tar.gz: !binary |-
-    ZTgwZTZlY2Y4ZTFiNGZhOGFkMDEzYzRmNjYyOWZhMDE4YWI3OTUwMw==
+    ZTgzMjBmOTNhMjhmZDA3ZmYzYzUzNTdmNTQzZGI4MThmOWNlMjc5Mg==
 SHA512:
   metadata.gz: !binary |-
-    M2MwZTkxNzhiYTY0ZWIwOWI4OGJhYTFmODU4MmQ5YjU3ZGFkY2I3Y2NmMWUw
-    MmM5OThmY2M1OGY1Yzg1M2U4NTU4ZjcwOGVkYjBmNmNmNGZiNzZlMGQxMDBi
-    ZjNiNGNjZTg0OGQzOGU1MTJhY2MyODFlODQ0MmYwMGE5ODJlZTM=
+    ZThiZGYwODM2ZmQyNGUwNjcxYThlNWJiNjE2ZDhmODE1MzJiMDcwYjU3YmEx
+    MWQ5OGY0NTY0NDE0Mjg1ZTBjMzUyMTRiMjllZmZiYzM0MTRlMmU4OTQzZmM5
+    ZTkwMmNhYTU4OWU1MjdiMWJjZjc3YzU1ZDY3YWI2NjU0ZWVjNDc=
   data.tar.gz: !binary |-
-    ZGJkOWQyZGNlNmUwNTIxNGE2NDYwYTFmYjFhMDEwNGM4OTBhMGJkM2JjYWY5
-    MTczZDA2YTFjY2VhNjIzZTkwMjNiYjIyMjZjZmQzOTZjYjFhNTllOWRmMjM3
-    NWJjNmJkMGJmZTA4ODIwYjZkNDAyMGRjM2UzYzYxNzFiNWYzMjc=
+    ZDk2YTQxZmFlZGU3MjFmYTQ1MTlhMzA0YTNhMmQyZjk3Mjg0YjM0ZWZmMTQy
+    N2IzMDU1ZmE1YzgxMTZjZjg1ZDE2MGU5MWMyYmZjNDQ2YWE3Y2I5YTU4NjE3
+    OWI2MjJhNmQxYmQ3Y2E3NGFlNjY2MDk1MDZkMGRiM2FhN2NjZGE=

data/.gitignore

@@ -13,3 +13,4 @@
 *.o
 *.a
 mkmf.log
+/.project

data/lib/seiso/import_master/master_item_mapper.rb

@@ -11,6 +11,7 @@ module Seiso
       def initialize
         @mappers = {
           'data-centers' => data_center_mapper,
+          'doc-links' => doc_link_mapper,
           'environments' => environment_mapper,
           'health-statuses' => health_status_mapper,
           'infrastructure-providers' => infrastructure_provider_mapper,
@@ -66,6 +67,16 @@ module Seiso
         }
       end
       
+      def doc_link_mapper
+        ->(dl) {
+          {
+            'title' => dl['title'],
+            'href' => dl['href'],
+            'description' => dl['description']
+          }
+        }
+      end
+
       def environment_mapper
         ->(e) {
           {

data/lib/seiso/import_master.rb

@@ -60,7 +60,10 @@ module Seiso
       
       # There are some special cases
       if type == 'nodes'
-        do_import_nodes master_items
+        si_key = doc['serviceInstance']
+        do_import_nodes(si_key, master_items)
+      elsif type == 'services'
+        do_import_services master_items
       elsif type == 'service-instances'
         do_import_service_instances master_items
       else
@@ -76,12 +79,22 @@ module Seiso
     end
     
     # Imports the nodes, along with their associated IP addresses.
-    def do_import_nodes(nodes)
+    def do_import_nodes(si_key, nodes)
       nips = detach_children(nodes, 'node', 'name', 'ipAddresses')
+      nodes.each do |n|
+        n['serviceInstance'] = si_key
+      end
       do_import_items('nodes', nodes)
       do_import_items('node-ip-addresses', nips)
     end
     
+    def do_import_services(services)
+      doc_links = detach_children(services, 'service', 'key', 'docLinks')
+      do_import_items('services', services)
+#      do_import_items('doc-links', docLinks)
+      doc_links.each { |dl| puts dl.to_json }
+    end
+
     # Imports the service instances, along with their associated ports and IP address roles.
     def do_import_service_instances(service_instances)
       ports = detach_children(service_instances, 'serviceInstance', 'key', 'ports')

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.5"
+  spec.version       = "0.0.6"
   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.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Imports Seiso data master files into Seiso.