Merge pull request #557 from agrare/ivanchuk_fix_aws_flavor_counts

[IVANCHUK] Fix AWS flavor counts in specs
ManageIQ · Sep 5, 2019 · 29786fa · 29786fa
2 parents 799ec02 + c0de3df
commit 29786fa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/spec/models/manageiq/providers/amazon/aws_refresher_spec_counts.rb b/spec/models/manageiq/providers/amazon/aws_refresher_spec_counts.rb
@@ -153,7 +153,7 @@ def table_counts_from_api
       :custom_attribute              => custom_attributes_count,
       :disk                          => disks_count,
       :firewall_rule                 => firewall_rules_count,
-      :flavor                        => 213,
+      :flavor                        => options.inventory_object_refresh ? 218 : 214,
       :floating_ip                   => floating_ips_count,
       :hardware                      => instances_and_images_count,
       :miq_template                  => images_count,

diff --git a/spec/models/manageiq/providers/amazon/cloud_manager/stubbed_refresher_spec.rb b/spec/models/manageiq/providers/amazon/cloud_manager/stubbed_refresher_spec.rb
@@ -138,7 +138,7 @@ def expected_table_counts(disconnect = nil)
       :auth_private_key                  => test_counts[:key_pair_count],
       :ext_management_system             => expected_ext_management_systems_count,
       # TODO(lsmola) collect all flavors for original refresh
-      :flavor                            => @inventory_object_settings[:inventory_object_refresh] ? 218 : 213,
+      :flavor                            => @inventory_object_settings[:inventory_object_refresh] ? 218 : 214,
       :availability_zone                 => 5,
       :vm_or_template                    => vm_count_plus_disconnect_inv + image_count_plus_disconnect_inv,
       :vm                                => vm_count_plus_disconnect_inv,

diff --git a/...dels/manageiq/providers/amazon/cloud_manager/vcr_specs/refresher_inventory_object_spec.rb b/...dels/manageiq/providers/amazon/cloud_manager/vcr_specs/refresher_inventory_object_spec.rb
@@ -65,7 +65,6 @@
 
   def table_counts_from_api
     counts                           = super
-    counts[:flavor]                  = counts[:flavor] + 5 # Graph refresh collect all flavors, not filtering them by known_flavors
     counts[:service_instances]       = 3
     counts[:service_offerings]       = 3
     counts[:service_parameters_sets] = 5

diff --git a/spec/models/manageiq/providers/amazon/cloud_manager/vcr_specs/targeted_refresh_scope_spec.rb b/spec/models/manageiq/providers/amazon/cloud_manager/vcr_specs/targeted_refresh_scope_spec.rb
@@ -328,7 +328,6 @@ def assert_all(stored_table_counts)
 
   def table_counts_from_api
     counts                           = super
-    counts[:flavor]                  = counts[:flavor] + 5 # Graph refresh collect all flavors, not filtering them by known_flavors
     counts[:service_instances]       = 3
     counts[:service_offerings]       = 3
     counts[:service_parameters_sets] = 5