Update refresher spec

ManageIQ · May 11, 2018 · 2b36faa · 2b36faa
1 parent 80e06e4
commit 2b36faa
Show file tree

Hide file tree

Showing 4 changed files with 65,674 additions and 7,515 deletions.
diff --git a/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb b/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb
@@ -129,7 +129,7 @@ def parse_volume(volume)
         zone_id = parse_uid_from_url(volume.zone)
 
         new_result = {
-          :ems_ref           => volume.id,
+          :ems_ref           => volume.id.to_s,
           :name              => volume.name,
           :status            => volume.status,
           :creation_time     => volume.creation_timestamp,
@@ -150,7 +150,7 @@ def parse_volume(volume)
 
       def parse_snapshot(snapshot)
         new_result = {
-          :ems_ref       => snapshot.id,
+          :ems_ref       => snapshot.id.to_s,
           :type          => "ManageIQ::Providers::Google::CloudManager::CloudVolumeSnapshot",
           :name          => snapshot.name,
           :status        => snapshot.status,
@@ -164,7 +164,7 @@ def parse_snapshot(snapshot)
       end
 
       def parse_storage_as_template(storage)
-        uid    = storage.id
+        uid    = storage.id.to_s
         name   = storage.name
         name ||= uid
         type   = ManageIQ::Providers::Google::CloudManager::Template.name
@@ -209,7 +209,7 @@ def parse_ssh_key(ssh_key)
       end
 
       def parse_instance(instance)
-        uid    = instance.id
+        uid    = instance.id.to_s
         name   = instance.name
         name ||= uid
 

diff --git a/app/models/manageiq/providers/google/network_manager/refresh_parser.rb b/app/models/manageiq/providers/google/network_manager/refresh_parser.rb
@@ -405,7 +405,7 @@ def parse_load_balancer_health_check(target_pool)
             :healthy_threshold                  => health_check.healthy_threshold,
             :load_balancer                      => load_balancer,
             :load_balancer_listener             => load_balancer_listener,
-            :load_balancer_health_check_members => parse_load_balancer_health_check_members(target_pool)
+            :load_balancer_health_check_members => parse_load_balancer_health_check_members(target_pool) || []
           }
           [uid, new_result]
         end
@@ -573,10 +573,12 @@ def parse_cloud_subnet_network_port(cloud_subnet_network_port, subnet_id)
       def parse_network_port(network_port)
         uid                        = network_port[:network_ip]
         cloud_subnet_network_ports = [
-          parse_cloud_subnet_network_port(network_port, subnets_by_link(network_port).try(:id))]
+          parse_cloud_subnet_network_port(network_port, subnets_by_link(network_port).try(:[], :id))
+        ]
         device                     = parent_manager_fetch_path(:vms, network_port[:device_id])
         security_groups            = [
-          @data_index.fetch_path(:security_groups, parse_uid_from_url(network_port[:network]))]
+          @data_index.fetch_path(:security_groups, parse_uid_from_url(network_port[:network]))
+        ]
 
         new_result = {
           :type                       => self.class.network_port_type,