Merge pull request #13569 from xlab-si/amazon/rename_ebs_storage_manager

Rename Amazon EBS storage manager
ManageIQ · Jan 18, 2017 · ab039d7 · ab039d7
2 parents a8b1931 + 28f4bf2
commit ab039d7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/app/models/miq_server/worker_management/monitor/class_names.rb b/app/models/miq_server/worker_management/monitor/class_names.rb
@@ -19,6 +19,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames
     ManageIQ::Providers::Azure::NetworkManager::RefreshWorker
     ManageIQ::Providers::Amazon::CloudManager::RefreshWorker
     ManageIQ::Providers::Amazon::NetworkManager::RefreshWorker
+    ManageIQ::Providers::Amazon::StorageManager::Ebs::RefreshWorker
     ManageIQ::Providers::Google::CloudManager::RefreshWorker
     ManageIQ::Providers::Google::NetworkManager::RefreshWorker
     ManageIQ::Providers::AnsibleTower::ConfigurationManager::RefreshWorker
@@ -95,6 +96,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames
     ManageIQ::Providers::Azure::NetworkManager::RefreshWorker
     ManageIQ::Providers::Amazon::CloudManager::RefreshWorker
     ManageIQ::Providers::Amazon::NetworkManager::RefreshWorker
+    ManageIQ::Providers::Amazon::StorageManager::Ebs::RefreshWorker
     ManageIQ::Providers::Google::CloudManager::RefreshWorker
     ManageIQ::Providers::Google::NetworkManager::RefreshWorker
     ManageIQ::Providers::AnsibleTower::ConfigurationManager::RefreshWorker

diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml
@@ -20,7 +20,7 @@
 - ems-type:cinder
 - ems-type:ec2
 - ems-type:ec2_network
-- ems-type:ec2_block_storage
+- ems-type:ec2_ebs_storage
 - ems-type:foreman_configuration
 - ems-type:foreman_provisioning
 - ems-type:gce

diff --git a/...ice_models/miq_ae_service_manageiq-providers-amazon-block_storage_manager-cloud_volume.rb b/...ice_models/miq_ae_service_manageiq-providers-amazon-block_storage_manager-cloud_volume.rb
diff --git a/...s/miq_ae_service_manageiq-providers-amazon-block_storage_manager-cloud_volume_snapshot.rb b/...s/miq_ae_service_manageiq-providers-amazon-block_storage_manager-cloud_volume_snapshot.rb
diff --git a/...n_engine/service_models/miq_ae_service_manageiq-providers-amazon-block_storage_manager.rb b/...n_engine/service_models/miq_ae_service_manageiq-providers-amazon-block_storage_manager.rb
diff --git a/...rvice_models/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs-cloud_volume.rb b/...rvice_models/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs-cloud_volume.rb
@@ -0,0 +1,4 @@
+module MiqAeMethodService
+  class MiqAeServiceManageIQ_Providers_Amazon_StorageManager_Ebs_CloudVolume < MiqAeServiceCloudVolume
+  end
+end
diff --git a/...els/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs-cloud_volume_snapshot.rb b/...els/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs-cloud_volume_snapshot.rb
@@ -0,0 +1,4 @@
+module MiqAeMethodService
+  class MiqAeServiceManageIQ_Providers_Amazon_StorageManager_Ebs_CloudVolumeSnapshot < MiqAeServiceCloudVolumeSnapshot
+  end
+end
diff --git a/...ion_engine/service_models/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs.rb b/...ion_engine/service_models/miq_ae_service_manageiq-providers-amazon-storage_manager-ebs.rb
@@ -0,0 +1,4 @@
+module MiqAeMethodService
+  class MiqAeServiceManageIQ_Providers_Amazon_StorageManager_Ebs < MiqAeServiceManageIQ_Providers_StorageManager
+  end
+end
diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb
@@ -23,7 +23,7 @@
       "azure_network"               => "Azure Network",
       "ec2"                         => "Amazon EC2",
       "ec2_network"                 => "Amazon EC2 Network",
-      "ec2_block_storage"           => "Amazon EBS",
+      "ec2_ebs_storage"             => "Amazon EBS",
       "foreman_configuration"       => "Foreman Configuration",
       "foreman_provisioning"        => "Foreman Provisioning",
       "gce"                         => "Google Compute Engine",