From 067f20e80717aed09996424f6d107c3d8715dd0c Mon Sep 17 00:00:00 2001 From: Gregor Berginc Date: Tue, 17 Jan 2017 21:44:53 +0100 Subject: [PATCH] Replace `ec2_block_storage` with specific `ec2_ebs_storage` Since we are now explicitly adding EBS provider, this patch changes the name of the corresponding dependent block storage manager. Signed-off-by: Gregor Berginc --- .../manageiq/providers/amazon/cloud_manager.rb | 12 ++++++------ .../manageiq/providers/amazon/storage_manager/ebs.rb | 2 +- .../storage_manager/ebs/stubbed_refresher_spec.rb | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/manageiq/providers/amazon/cloud_manager.rb b/app/models/manageiq/providers/amazon/cloud_manager.rb index 4ca237807..0dec33106 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager.rb @@ -47,7 +47,7 @@ class ManageIQ::Providers::Amazon::CloudManager < ManageIQ::Providers::CloudMana :to => :network_manager, :allow_nil => true - has_one :block_storage_manager, + has_one :ebs_storage_manager, :foreign_key => :parent_ems_id, :class_name => "ManageIQ::Providers::Amazon::StorageManager::EBS", :autosave => true, @@ -55,7 +55,7 @@ class ManageIQ::Providers::Amazon::CloudManager < ManageIQ::Providers::CloudMana delegate :cloud_volumes, :cloud_volume_snapshots, - :to => :block_storage_manager, + :to => :ebs_storage_manager, :allow_nil => true before_create :ensure_managers @@ -70,10 +70,10 @@ def ensure_managers network_manager.zone_id = zone_id network_manager.provider_region = provider_region - build_block_storage_manager unless block_storage_manager - block_storage_manager.name = "#{name} Block Storage Manager" - block_storage_manager.zone_id = zone_id - block_storage_manager.provider_region = provider_region + build_ebs_storage_manager unless ebs_storage_manager + ebs_storage_manager.name = "#{name} EBS Storage Manager" + ebs_storage_manager.zone_id = zone_id + ebs_storage_manager.provider_region = provider_region end def self.ems_type diff --git a/app/models/manageiq/providers/amazon/storage_manager/ebs.rb b/app/models/manageiq/providers/amazon/storage_manager/ebs.rb index 3a0762308..ad42c4716 100644 --- a/app/models/manageiq/providers/amazon/storage_manager/ebs.rb +++ b/app/models/manageiq/providers/amazon/storage_manager/ebs.rb @@ -24,7 +24,7 @@ class ManageIQ::Providers::Amazon::StorageManager::EBS < ManageIQ::Providers::St :allow_nil => true def self.ems_type - @ems_type ||= "ec2_block_storage".freeze + @ems_type ||= "ec2_ebs_storage".freeze end def self.description diff --git a/spec/models/manageiq/providers/amazon/storage_manager/ebs/stubbed_refresher_spec.rb b/spec/models/manageiq/providers/amazon/storage_manager/ebs/stubbed_refresher_spec.rb index 906684dff..561884b98 100644 --- a/spec/models/manageiq/providers/amazon/storage_manager/ebs/stubbed_refresher_spec.rb +++ b/spec/models/manageiq/providers/amazon/storage_manager/ebs/stubbed_refresher_spec.rb @@ -19,7 +19,7 @@ ].each do |settings| context "with settings #{settings}" do before :each do - allow(Settings.ems_refresh).to receive(:ec2_block_storage).and_return(settings) + allow(Settings.ems_refresh).to receive(:ec2_ebs_storage).and_return(settings) end it "2 refreshes, first creates all entities, second updates all entitites" do @@ -65,7 +65,7 @@ def refresh_spec @ems.reload with_aws_stubbed(stub_responses) do - EmsRefresh.refresh(@ems.block_storage_manager) + EmsRefresh.refresh(@ems.ebs_storage_manager) end @ems.reload @@ -174,7 +174,7 @@ def assert_table_counts end def assert_ems - ems = @ems.block_storage_manager + ems = @ems.ebs_storage_manager expect(ems).to have_attributes(:api_version => nil, # TODO: Should be 3.0 :uid_ems => nil)