seiso-import_master 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2RiZjI2ZjkwYTFlN2IwMzk3NWYzMDBlODRjNDA1ZTg5ZDRlMjU5Ng==
+    YjkyNzU5ZWYyNWMyNGViYzEzMjdjMDEzZTFiZjQ4N2I2Yzc0OGVlMw==
   data.tar.gz: !binary |-
-    ZGRlNDZjN2Q2NjZjZGUzMjdmMDJkYzJlNzU2N2Y3OTQyYjE3Y2Q5MQ==
+    ODJlZTgwMWEyY2M2Njc2OThjNTgwY2FhMmU1NWQ0ZDM4NTQ5YzFkZg==
 SHA512:
   metadata.gz: !binary |-
-    YzNmMWM4MTMxNjA4NTFlYjczYjk3ZGMzZTY0MmQwYzViNGM2ZGJjMDhiZmRj
-    YmViM2MyOTdlZTYyYjAzZmY1ZjU1ODhiMmRhODY2YzVkZDY5OGIzZTIyNWE2
-    ZTgyODQ4ZmUxM2I2YTI2YjI4N2Y4N2E5NzJiMTk1NTBmNTUxODk=
+    ZGQ4MGU4ZTk0NWMyMGI5M2Y2MzQ5YWU4MzNlM2U2OGUyZjZmODZlNTIxNWE5
+    MjQ1OTIyOTEyYjdmYjgxN2M3NWEzODM1MWI0NWMzYWFhZWYzMmQ2ZWZiMWNk
+    MDliOGRlYWQxYTg2ODFlZGIyYWNjNjBmNTcwMDExMzc0ZTUyZTk=
   data.tar.gz: !binary |-
-    MjgxNzdmNTNkYzY2MjFmOTBlZGQ4NjM4MTU4Y2RlYzEzMzU4Y2IzNWI2NmMx
-    OTk0YzAwZTBmOGFlY2M5MDBkNTcxZGEzZGMyYTc0MzM3N2E5YWU5NWY0Y2Ey
-    ZjMxM2MxMjU2MTFiZDlhODIwODI2NWFhOTJhNTFhZDkwOWNkMTE=
+    NTBjZDRjMzk1ZDg4MjE5YTgxM2ZkYjU1ZGE1YWUwM2IzYWJmNjU0YTA3NzBm
+    ZGE5NjhjZGU3ZjU3M2Y3ZDg2MzIwZTY5MjE5NGE2YmRmMDBmYjVkOWYyYTcx
+    NTU2YWRjMGI0OTA1OTc0N2JhZDIyNDMyMWZkOThkMDM4ZGI4YzI=

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

@@ -9,6 +9,11 @@ module Seiso
 
 	      # Enriches children with a link to the parent, detaches them from the parent, and returns
 	      # all detached children.
+        # 
+        # - parents: List of items whose children we will detach.
+        # - parent_prop: Name of the parent property on the children.
+        # - parent_key: Name that Seiso expects for the parent key.
+        # - child_prop: Name of the child property on the items.
 	      def detach_children(parents, parent_prop, parent_key, child_prop)
 	        all_children = []
 	        parents.each do |p|

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

@@ -1,3 +1,4 @@
+require "uri"
 require_relative "base_importer"
 
 module Seiso
@@ -36,11 +37,13 @@ module Seiso
 					sdm_service_instances = doc['items']
 		      sdm_ports = detach_children(sdm_service_instances, 'serviceInstance', 'key', 'ports')
 		      sdm_roles = detach_children(sdm_service_instances, 'serviceInstance', 'key', 'ipAddressRoles')
+          sdm_dependencies = detach_children(sdm_service_instances, 'serviceInstance', 'key', 'dependencies')
           sdm_seyren_checks = detach_children(sdm_service_instances, 'serviceInstance', 'key', 'seyrenChecks')
 
           import_service_instances sdm_service_instances
           import_ports sdm_ports
           import_ip_address_roles sdm_roles
+          import_dependencies sdm_dependencies
           import_seyren_checks sdm_seyren_checks
 				end
 
@@ -68,6 +71,97 @@ module Seiso
           @seiso.post_items('ip-address-roles', seiso_roles)
         end
 
+        def import_dependencies(sdm_dependencies)
+          puts "Importing dependencies"
+          seiso_dependencies = @service_instance_mapper.seiso_service_instance_dependencies sdm_dependencies
+          grouped_seiso_dependencies = group_dependencies_by_service_instance seiso_dependencies
+
+          # Iterate over the groups, deleting stale dependencies and importing the rest
+          grouped_seiso_dependencies.each do |key, group|
+            puts "key=#{key}, group=#{group}"
+            delete_stale_dependencies(key, group)
+
+            # Import the dependencies.
+            group.each do |d|
+              dependent_key = d['dependent']['key']
+              dependency_key = d['dependency']['key']
+              puts "Importing dependency: dependent=#{dependent_key}, dependency=#{dependency_key}"
+              search_uri = @uri_factory_v2.uri "/service-instance-dependencies/search/find-by-keys?dependent=#{dependent_key}&dependency=#{dependency_key}"
+
+              # TODO 404 means POST, 200 means PUT
+              seiso_sid_response = @rest_connector_v2.get search_uri
+
+              if seiso_sid_response.code == "200"
+                # Found it, so PUT
+                seiso_sid = JSON.parse seiso_sid_response.body
+                dep_uri = URI.parse(seiso_sid['_links']['self']['href'])
+#                puts "dep_uri=#{dep_uri}"
+#                puts JSON.pretty_generate(d)
+                @rest_connector_v2.put(dep_uri, d)
+              elsif seiso_sid_response.code == "404"
+                # Not found, so POST
+                deps_uri = @uri_factory_v2.uri "/service-instance-dependencies"
+                @rest_connector_v2.post(deps_uri, d)
+              else
+                puts "Don't know how to handle response code #{seiso_sid.code}; skipping."
+              end
+            end
+          end
+        end
+
+        # Helper for import_dependencies
+        def group_dependencies_by_service_instance(seiso_dependencies)
+          grouped_seiso_dependencies = {}
+          seiso_dependencies.each do |d|
+            dependent_key = d['dependent']['key']
+            puts "dependent_key=#{dependent_key}"
+            group = grouped_seiso_dependencies[dependent_key]
+            if group.nil?
+              group = []
+              grouped_seiso_dependencies[dependent_key] = group
+            end
+            group << d
+          end
+          grouped_seiso_dependencies
+        end
+
+        # Helper for import_dependencies
+        # 
+        # - dependent_key: Key of the dependent service instance.
+        # - local_dependencies: List of local dependencies (in Seiso format) associated with
+        #   the specified dependent.
+        def delete_stale_dependencies(dependent_key, local_dependencies)
+          puts "Deleting stale dependencies for service instance #{dependent_key}"
+
+          local_dependency_keys = local_dependencies.map do |local|
+            # TODO Will need to update when I update the v2 API
+            local['dependency']['key']
+          end
+
+          # FIXME This isn't accounting for pagination!
+          # If there are a lot of remote dependencies, some may not be marked as stale.
+          # Just need to implement it. [WLW]
+          remote_dependencies_uri =
+              @uri_factory_v2.uri "/service-instance-dependencies/search/find-by-dependent?key=#{dependent_key}"
+          remote_dependencies_response = @rest_connector_v2.get remote_dependencies_uri
+          remote_dependencies = JSON.parse(remote_dependencies_response.body)['_embedded']['items']
+
+          # Identify stale dependencies
+          stale_remote_dependencies = remote_dependencies.reject do |remote|
+            local_dependency_keys.include? remote['_embedded']['dependency']['key']
+          end
+
+          # Delete stale dependencies from Seiso
+          if stale_remote_dependencies.empty?
+            puts "No stale dependencies for service instance #{dependent_key}"
+          else
+            stale_remote_dependencies.each do |stale|
+              uri = URI.parse stale['_links']['self']['href']
+              @rest_connector_v2.delete uri
+            end
+          end
+        end
+
         def import_seyren_checks(sdm_checks)
           puts "Importing Seyren checks"
 
@@ -113,7 +207,6 @@ module Seiso
           end
 
         end
-
 			end # class ServiceInstanceImporter
 		end # module Importers
 	end # class ImportMaster

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

@@ -57,6 +57,19 @@ module Seiso
             'description' => p['description']
           }
         end
+
+        def seiso_service_instance_dependencies(sdm_dependencies)
+          sdm_dependencies.map do |d|
+            seiso_service_instance_dependency d
+          end
+        end
+
+        def seiso_service_instance_dependency(d)
+          {
+            'dependent' => { 'key' => d['serviceInstance'] },
+            'dependency' => { 'key' => d['key'] }
+          }
+        end
 			end
 		end
 	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.10"
+  spec.version       = "0.0.11"
   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.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler