topological_inventory-core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14973202e680d9bf035a3c85d5ef856140bf11d934bfc488cbade6932c8239c1
-  data.tar.gz: 7493112f3e945f0d0e20cb86385add9f45f623e2825c08b8a3a4ac2a62994822
+  metadata.gz: 7bafb3cb3b7789833d6fafd71e34da8e172039ae49f7fe03a16fac40cba7be4e
+  data.tar.gz: e642d51826923f406e0a24ca75ea57fea47af01386217b7c1d240e0dad7dded1
 SHA512:
-  metadata.gz: '08de615e242bc7dd1ec6f4349386064855b947602986736a8095c3b4802adc0fbeabd5aeb03dcc3d965d3a882f8a989c646624482c45de5235a5457797cef871'
-  data.tar.gz: fb1e4895ac6ecb98b6564ed411f5107417b5b2f68ee5a1346312f59b32598065d46d300ed158750fa0df2e85868958e7e347b2f82818e00d39db01cf1a414869
+  metadata.gz: 4728c1a6494e41e969d034f14ad64bd4bdb2ec1b1c2ce16bc61d00d327ae49b4fbde05d23dc313b773bb2b261af791b0882ab4803626b785e069f4e4e5f7bcf1
+  data.tar.gz: ac02e6f01322313ece2855c8876a3ae9224cf23a7c3bf86da66a597df76ee8affcfd43aef48693dc30752a8a9fce5b4df1035df08ba39e7beb9d7e4746b9b347

data/lib/topological_inventory/core/version.rb

@@ -1,5 +1,5 @@
 module TopologicalInventory
   module Core
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/lib/topological_inventory/schema/default.rb

@@ -147,19 +147,19 @@ module TopologicalInventory
         return if src_refs.blank?
 
         # Updating Tasks
-        # service_instance_tasks_update_effective()
+        # service_instance_tasks_update_effective(source)
         service_instance_tasks_update_ineffective(source, src_refs)
       end
 
-      def task_update_values(svc_instance_id, external_url, status, finished_timestamp)
+      def task_update_values(svc_instance_id, external_url, status, task_status, finished_timestamp)
         {
           :state  => finished_timestamp.blank? ? 'running' : 'completed',
-          :status => %w[error failed].include?(status) ? 'error' : 'ok', # TODO: ansible-tower specific, normalize in collector
+          :status => task_status,
           :context => {
-            :remote_status => status,
             :service_instance => {
-              :id => svc_instance_id,
-              :url => external_url
+              :id         => svc_instance_id,
+              :job_status => status,
+              :url        => external_url
             }
           }
         }
@@ -175,7 +175,7 @@ module TopologicalInventory
             group.each do |svc_instance|
               next if tasks_by_source_ref[svc_instance.source_ref].nil?
 
-              values = task_update_values(svc_instance.id, svc_instance.external_url, svc_instance.extra['status'], svc_instance.extra['finished'])
+              values = task_update_values(svc_instance.id, svc_instance.external_url, svc_instance.extra['status'], svc_instance.extra['task_status'], svc_instance.extra['finished'])
               tasks_by_source_ref[svc_instance.source_ref].update(values)
             end
           end
@@ -183,27 +183,27 @@ module TopologicalInventory
       end
 
       # This method is bulk updating by raw SQL query
-      def service_instance_tasks_update_effective
+      def service_instance_tasks_update_effective(source)
         # Get running tasks
-        tasks_values = Task.where(:state => 'running', :target_type => 'ServiceInstance', :source_id => source.id)
-                         .pluck(:id, :target_source_ref)
-        tasks_id, tasks_source_ref = [], []
-        tasks_values.each do |attrs|
-          tasks_id << attrs[0]
-          tasks_source_ref << attrs[1]
-        end
+        tasks_source_ref = Task.where(:state => 'running', :target_type => 'ServiceInstance', :source_id => source.id)
+                         .pluck(:target_source_ref)
+        return if tasks_source_ref.blank?
 
         # Load saved service instances (IDs needed)
-        service_instances_values = ServiceInstance.where(:source_ref => tasks_source_ref).pluck(:id, :external_url, :source_ref, Arel.sql("extra->'finished'"), Arel.sql("extra->'status'"))
-        return if service_instances_values.blank?
+        svc_instances_values = ServiceInstance.where(:source_ref => tasks_source_ref)
+                                 .pluck(:id, :external_url, :source_ref,
+                                        Arel.sql("extra->'finished'"),
+                                        Arel.sql("extra->'status'"),
+                                        Arel.sql("extra->'task_status'"))
+        return if svc_instances_values.blank?
 
         sql_update_values = []
 
         # Preparing SQL update values from loaded ServiceInstances
-        service_instances_values.each do |attrs|
-          id, external_url, source_ref, finished_timestamp, status = attrs[0], attrs[1], attrs[2], attrs[3], attrs[4]
+        svc_instances_values.each do |attrs|
+          id, external_url, source_ref, finished_timestamp, status, task_status = attrs[0], attrs[1], attrs[2], attrs[3], attrs[4], attrs[5]
 
-          values = task_update_values(id, external_url, status, finished_timestamp)
+          values = task_update_values(id, external_url, status, task_status, finished_timestamp)
           sql_update_values << "('#{source_ref}', '#{values[:state]}', '#{values[:status]}', '#{values[:context].to_json}'::json)"
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Grare