Separate Storage Managers By Type in UI

1. Add the ability to show Storage Managers by the type of storage they support.
2. Add supports_block_storage? and supports_object_storage? methods
   and add them to the Cinder and Swift managers, respectively.
3. Change the UI so that it Shows Block and Object storage and the managers for each
   separately.
4. Make menu and headings for Storage Managers consistent (remove any indication that the
   Managers are "Providers").

app/controllers/cloud_object_store_container_controller.rb

@@ -25,7 +25,7 @@ def self.display_methods
   private
 
   def get_session_data
-    @title      = _("Cloud Object Stores")
+    @title      = _("Cloud Object Store Containers")
     @layout     = "cloud_object_store_container"
     @lastaction = session[:cloud_object_store_container_lastaction]
     @display    = session[:cloud_object_store_container_display]

app/controllers/ems_block_storage_controller.rb

@@ -0,0 +1,38 @@
+class EmsBlockStorageController < ApplicationController
+  include EmsCommon
+  include Mixins::EmsCommonAngular
+  include Mixins::GenericSessionMixin
+
+  before_action :check_privileges
+  before_action :get_session_data
+  after_action :cleanup_action
+  after_action :set_session_data
+
+  def self.model
+    ManageIQ::Providers::StorageManager
+  end
+
+  def self.table_name
+    @table_name ||= "ems_storage"
+  end
+
+  def ems_path(*args)
+    path_hash = {:action => 'show', :id => args[0].id.to_s }
+    path_hash.merge(args[1])
+  end
+
+  def new_ems_path
+    {:action => 'new'}
+  end
+
+  def ems_storage_form_fields
+    ems_form_fields
+  end
+
+  # Show the main MS list view
+  def show_list
+    opts = {:supported_features_filter => "supports_block_storage?",
+            :model           => model}
+    process_show_list(opts)
+  end
+end

app/controllers/ems_common.rb

@@ -76,14 +76,20 @@ def view_setup_params
     {
       "instances"                     => [ManageIQ::Providers::CloudManager::Vm, _("Instances")],
       "images"                        => [ManageIQ::Providers::CloudManager::Template, _("Images")],
+      "block_storage_managers"        => [ManageIQ::Providers::StorageManager,
+                                          _("Block Storage Managers"),
+                                          :block_storage_managers],
+      "object_storage_managers"        => [ManageIQ::Providers::StorageManager,
+                                          _("Object Storage Managers"),
+                                          :object_storage_managers],
       "storage_managers"              => [ManageIQ::Providers::StorageManager,
                                           _("Storage Managers"),
                                           :storage_managers],
       "miq_templates"                 => [MiqTemplate,            _("Templates")],
       "vms"                           => [Vm,                     _("VMs")],
       "orchestration_stacks"          => [OrchestrationStack,     _("Stacks")],
       # "configuration_jobs"            => [ConfigurationJob, _("Configuration Jobs")],
-      "cloud_object_store_containers" => [CloudObjectStoreContainer, _('Cloud Object Stores')],
+      "cloud_object_store_containers" => [CloudObjectStoreContainer, _('Cloud Object Store Containers')],
       'containers'                    => [Container,              _('Containers')],
       'container_replicators'         => [ContainerReplicator,    _('Container Replicators')],
       'container_nodes'               => [ContainerNode,          _('Container Nodes')],

app/controllers/ems_object_storage_controller.rb

@@ -0,0 +1,37 @@
+class EmsObjectStorageController < ApplicationController
+  include EmsCommon
+  include Mixins::EmsCommonAngular
+  include Mixins::GenericSessionMixin
+
+  before_action :check_privileges
+  before_action :get_session_data
+  after_action :cleanup_action
+  after_action :set_session_data
+
+  def self.model
+    ManageIQ::Providers::StorageManager
+  end
+
+  def self.table_name
+    @table_name ||= "ems_storage"
+  end
+
+  def ems_path(*args)
+    path_hash = {:action => 'show', :id => args[0].id.to_s }
+    path_hash.merge(args[1])
+  end
+
+  def show_list
+    opts = {:supported_features_filter => "supports_object_storage?",
+            :model  => model}
+    process_show_list(opts)
+  end
+
+  def new_ems_path
+    {:action => 'new'}
+  end
+
+  def ems_storage_form_fields
+    ems_form_fields
+  end
+end

app/models/manageiq/providers/storage_manager.rb

@@ -7,6 +7,8 @@ module ManageIQ::Providers
   class StorageManager < ManageIQ::Providers::BaseManager
     include SupportsFeatureMixin
     supports_not :smartstate_analysis
+    supports_not :block_storage
+    supports_not :object_storage
 
     belongs_to :parent_manager,
                :foreign_key => :parent_ems_id,

app/models/manageiq/providers/storage_manager/cinder_manager.rb

@@ -31,6 +31,7 @@ class ManageIQ::Providers::StorageManager::CinderManager < ManageIQ::Providers::
            :to        => :parent_manager,
            :allow_nil => true
 
+  supports :block_storage
   supports :cinder_service do
     if parent_manager
       unsupported_reason_add(:cinder_service, parent_manager.unsupported_reason(:cinder_service)) unless

app/models/manageiq/providers/storage_manager/swift_manager.rb

@@ -24,6 +24,7 @@ class ManageIQ::Providers::StorageManager::SwiftManager < ManageIQ::Providers::S
            :to        => :parent_manager,
            :allow_nil => true
 
+  supports :object_storage
   supports :swift_service do
     if parent_manager
       unsupported_reason_add(:swift_service, parent_manager.unsupported_reason(:swift_service)) unless

app/models/miq_report/search.rb

@@ -100,8 +100,8 @@ def paged_view_search(options = {})
       targets = db_class
     end
     supported_features_filter = search_options.delete(:supported_features_filter) if search_options[:supported_features_filter]
-    search_results, attrs = Rbac.search(search_options.merge(:targets => targets))
-    filtered_results      = filter_results(search_results, supported_features_filter)
+    search_results, attrs     = Rbac.search(search_options.merge(:targets => targets))
+    filtered_results          = filter_results(search_results, supported_features_filter)
 
     if order.nil?
       options[:limit]   = limit

app/models/mixins/supports_feature_mixin.rb

@@ -110,6 +110,8 @@ module SupportsFeatureMixin
     :update_network_router      => 'Network Router Update',
     :ems_network_new            => 'New EMS Network Provider',
     :update_security_group      => 'Security Group Update',
+    :block_storage              => 'Block Storage',
+    :object_storage             => 'Object Storage',
   }.freeze
 
   # Whenever this mixin is included we define all features as unsupported by default.

app/presenters/menu/default_menu.rb

@@ -152,10 +152,54 @@ def network_menu_section
       def storage_menu_section
         netapp_enabled = ::Settings.product.storage
         Menu::Section.new(:sto, N_("Storage"), 'fa fa-database fa-2x', [
-          Menu::Item.new('ems_storage',                  N_('Storage Providers'), 'ems_storage',                  {:feature => 'ems_storage_show_list'},                  '/ems_storage'),
-          Menu::Item.new('cloud_volume',                 N_('Volumes'),           'cloud_volume',                 {:feature => 'cloud_volume_show_list'},                 '/cloud_volume'),
-          Menu::Item.new('cloud_object_store_container', N_('Object Stores'),     'cloud_object_store_container', {:feature => 'cloud_object_store_container_show_list'}, '/cloud_object_store_container'),
-        ])
+                          block_storage_menu_section,
+                          object_storage_menu_section,
+                          ])
+      end
+
+      def block_storage_menu_section
+        Menu::Section.new(:bst, N_("Block Storage"), 'fa fa-database fa-2x', [
+                            Menu::Item.new('ems_storage',
+                                           N_('Managers'),
+                                           'ems_block_storage',
+                                           {:feature => 'ems_block_storage_show_list'},
+                                           '/ems_block_storage'),
+                            Menu::Item.new('cloud_volume',
+                                           N_('Volumes'),
+                                           'cloud_volume',
+                                           {:feature => 'cloud_volume_show_list'},
+                                           '/cloud_volume'),
+                            Menu::Item.new('cloud_volume_snapshot',
+                                           N_('Volume Snapshots'),
+                                           'cloud_volume_snapshot',
+                                           {:feature => 'cloud_volume_snapshot_show_list'},
+                                           '/cloud_volume_snapshot'),
+                            Menu::Item.new('cloud_volume_backup',
+                                           N_('Volume Backups'),
+                                           'cloud_volume_backup',
+                                           {:feature => 'cloud_volume_backup_show_list'},
+                                           '/cloud_volume_backup'),
+                          ])
+      end
+
+      def object_storage_menu_section
+        Menu::Section.new(:ost, N_("Object Storage"), 'fa fa-database fa-2x', [
+                            Menu::Item.new('ems_storage',
+                                           N_('Managers'),
+                                           'ems_object_storage',
+                                           {:feature => 'ems_object_storage_show_list'},
+                                           '/ems_object_storage'),
+                            Menu::Item.new('cloud_object_store_container',
+                                           N_('Object Store Containers'),
+                                           'cloud_object_store_container',
+                                           {:feature => 'cloud_object_store_container_show_list'},
+                                           '/cloud_object_store_container'),
+                            Menu::Item.new('cloud_object_store_object',
+                                           N_('Object Store Objects'),
+                                           'cloud_object_store_object',
+                                           {:feature => 'cloud_object_store_object_show_list'},
+                                           '/cloud_object_store_object'),
+                          ])
       end
 
       def empty_menu_section

app/views/ems_block_storage/_main.html.haml

@@ -0,0 +1 @@
+= render(:partial => "shared/views/ems_common/main")

app/views/ems_block_storage/edit.html.haml

@@ -0,0 +1,19 @@
+- url = url_for(:controller => 'ems_block_storage', :action => 'update', :id => "#{@ems.id || 'new'}")
+= form_for(@ems,
+           :url    => url,
+           :method => :post,
+           :html   => {"ng-controller"   => "emsCommonFormController",
+                       "name"            => "angularForm",
+                       "ng-show"         => "afterGet",
+                       "update-url"      => url,
+                       "form-fields-url" => "/#{controller_name}/ems_block_storage_form_fields/",
+                       "novalidate"      => true}) do |f|
+  %input{:type => 'hidden', :id => "form_id", :value => "##{f.options[:html][:id]}"}
+  %input{:type => 'hidden', :id => "button_name", :name => "button", :value => "save"}
+  %input{:type => 'hidden', :id => "cred_type", :name => "cred_type", :value => "default"}
+  = render :partial => "shared/views/ems_common/angular/form"
+
+:javascript
+  ManageIQ.angular.app.value('emsCommonFormId', '#{@ems.id || "new"}');
+  miq_bootstrap($('#form_id').val());
+

app/views/ems_block_storage/new.html.haml

@@ -0,0 +1,20 @@
+- url = url_for(:controller => 'ems_block_storage', :action => 'create', :id => "#{@ems.id || 'new'}")
+= form_for(@ems,
+           :url    => url,
+           :method => :post,
+           :html   => {"ng-controller"   => "emsCommonFormController",
+                       "name"            => "angularForm",
+                       "ng-show"         => "afterGet",
+                       "create-url"      => url,
+                       "form-fields-url" => "/#{controller_name}/ems_block_storage_form_fields/",
+                       "novalidate"      => true}) do |f|
+  %input{:type => 'hidden', :id => "form_id", :value => "##{f.options[:html][:id]}"}
+  %input{:type => 'hidden', :id => "button_name", :name => "button", :value => "add"}
+  %input{:type => 'hidden', :id => "cred_type", :name => "cred_type", :value => "default"}
+
+  = render :partial => "shared/views/ems_common/angular/form"
+
+:javascript
+  ManageIQ.angular.app.value('emsCommonFormId', '#{@ems.id || "new"}');
+  miq_bootstrap($('#form_id').val());
+

app/views/ems_block_storage/show_list.html.haml

@@ -0,0 +1 @@
+#main_div= render :partial => "layouts/gtl"

app/views/ems_block_storage/show_policy_timeline.html.haml

@@ -0,0 +1 @@
+#main_div= render :partial => "layouts/tl_show"

app/views/ems_object_storage/_main.html.haml

@@ -0,0 +1 @@
+= render(:partial => "shared/views/ems_common/main")

app/views/ems_object_storage/edit.html.haml

@@ -0,0 +1,19 @@
+- url = url_for(:controller => 'ems_object_storage', :action => 'update', :id => "#{@ems.id || 'new'}")
+= form_for(@ems,
+           :url    => url,
+           :method => :post,
+           :html   => {"ng-controller"   => "emsCommonFormController",
+                       "name"            => "angularForm",
+                       "ng-show"         => "afterGet",
+                       "update-url"      => url,
+                       "form-fields-url" => "/#{controller_name}/ems_object_storage_form_fields/",
+                       "novalidate"      => true}) do |f|
+  %input{:type => 'hidden', :id => "form_id", :value => "##{f.options[:html][:id]}"}
+  %input{:type => 'hidden', :id => "button_name", :name => "button", :value => "save"}
+  %input{:type => 'hidden', :id => "cred_type", :name => "cred_type", :value => "default"}
+  = render :partial => "shared/views/ems_common/angular/form"
+
+:javascript
+  ManageIQ.angular.app.value('emsCommonFormId', '#{@ems.id || "new"}');
+  miq_bootstrap($('#form_id').val());
+

app/views/ems_object_storage/new.html.haml

@@ -0,0 +1,20 @@
+- url = url_for(:controller => 'ems_object_storage', :action => 'create', :id => "#{@ems.id || 'new'}")
+= form_for(@ems,
+           :url    => url,
+           :method => :post,
+           :html   => {"ng-controller"   => "emsCommonFormController",
+                       "name"            => "angularForm",
+                       "ng-show"         => "afterGet",
+                       "create-url"      => url,
+                       "form-fields-url" => "/#{controller_name}/ems_object_storage_form_fields/",
+                       "novalidate"      => true}) do |f|
+  %input{:type => 'hidden', :id => "form_id", :value => "##{f.options[:html][:id]}"}
+  %input{:type => 'hidden', :id => "button_name", :name => "button", :value => "add"}
+  %input{:type => 'hidden', :id => "cred_type", :name => "cred_type", :value => "default"}
+
+  = render :partial => "shared/views/ems_common/angular/form"
+
+:javascript
+  ManageIQ.angular.app.value('emsCommonFormId', '#{@ems.id || "new"}');
+  miq_bootstrap($('#form_id').val());
+

app/views/ems_object_storage/show_list.html.haml

@@ -0,0 +1 @@
+#main_div= render :partial => "layouts/gtl"

app/views/ems_object_storage/show_policy_timeline.html.haml

@@ -0,0 +1 @@
+#main_div= render :partial => "layouts/tl_show"

config/routes.rb

@@ -2084,6 +2084,93 @@
                ownership_post
     },
 
+    :ems_block_storage              => {
+      :get  => %w(
+        dialog_load
+        download_data
+        edit
+        ems_storage_form_fields
+        index
+        new
+        protect
+        show
+        show_list
+        tagging_edit
+        tag_edit_form_field_changed
+      ) +
+        compare_get,
+      :post => %w(
+        button
+        create
+        dynamic_checkbox_refresh
+        dynamic_list_refresh
+        dynamic_radio_button_refresh
+        dynamic_text_box_refresh
+        form_field_changed
+        listnav_search_selected
+        protect
+        provider_type_field_changed
+        quick_search
+        sections_field_changed
+        show
+        show_list
+        quick_search
+        tag_edit_form_field_changed
+        tagging_edit
+        tl_chooser
+        update
+        wait_for_task
+      ) +
+        adv_search_post +
+        compare_post +
+        dialog_runner_post +
+        exp_post +
+        save_post
+    },
+
+    :ems_object_storage              => {
+      :get  => %w(
+        dialog_load
+        download_data
+        edit
+        ems_storage_form_fields
+        index
+        new
+        protect
+        show
+        show_list
+        tagging_edit
+        tag_edit_form_field_changed
+      ) +
+        compare_get,
+      :post => %w(
+        button
+        create
+        dynamic_checkbox_refresh
+        dynamic_list_refresh
+        dynamic_radio_button_refresh
+        dynamic_text_box_refresh
+        form_field_changed
+        listnav_search_selected
+        protect
+        provider_type_field_changed
+        quick_search
+        sections_field_changed
+        show
+        show_list
+        tag_edit_form_field_changed
+        tagging_edit
+        tl_chooser
+        update
+        wait_for_task
+      ) +
+        adv_search_post +
+        compare_post +
+        dialog_runner_post +
+        exp_post +
+        save_post
+    },
+
     :ems_storage              => {
       :get  => %w(
         dialog_load