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 <[email protected]>
ManageIQ · Jan 17, 2017 · 067f20e · 067f20e
1 parent b72eee5
commit 067f20e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/models/manageiq/providers/amazon/cloud_manager.rb b/app/models/manageiq/providers/amazon/cloud_manager.rb
@@ -47,15 +47,15 @@ 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,
           :dependent   => :destroy
 
   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
@@ -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
@@ -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)