From c0de3df21a1a3fe1ffa9d74d3aa79894bfb956fb Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Wed, 4 Sep 2019 12:07:20 -0400 Subject: [PATCH] Fix AWS flavor counts in specs This fixes the flavor counts in AWS specs --- .../manageiq/providers/amazon/aws_refresher_spec_counts.rb | 2 +- .../providers/amazon/cloud_manager/stubbed_refresher_spec.rb | 2 +- .../cloud_manager/vcr_specs/refresher_inventory_object_spec.rb | 1 - .../cloud_manager/vcr_specs/targeted_refresh_scope_spec.rb | 1 - 4 files changed, 2 insertions(+), 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 index f7dd543cb..80d71d19f 100644 --- 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 index 2b19d0a75..51b7f4b06 100644 --- 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/spec/models/manageiq/providers/amazon/cloud_manager/vcr_specs/refresher_inventory_object_spec.rb b/spec/models/manageiq/providers/amazon/cloud_manager/vcr_specs/refresher_inventory_object_spec.rb index 0e732d5c1..095b2b6c8 100644 --- a/spec/models/manageiq/providers/amazon/cloud_manager/vcr_specs/refresher_inventory_object_spec.rb +++ b/spec/models/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 index bf8caa1e0..620c1a3f7 100644 --- 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