Merge pull request #9257 from agrare/revert_cloud_resource_pools

Revert cloud resource pools

app/controllers/application_controller/ci_processing.rb

@@ -852,13 +852,8 @@ def delete_flavors
   end
 
   # Delete all selected or single displayed RP(s)
-  def deletecloudresourcepools
-    assert_privileges("resource_pool_cloud_delete")
-    delete_elements(ResourcePool, :process_resourcepools)
-  end
-
-  def deleteinfraresourcepools
-    assert_privileges("resource_pool_infra_delete")
+  def deleteresourcepools
+    assert_privileges("resource_pool_delete")
     delete_elements(ResourcePool, :process_resourcepools)
   end
 

app/controllers/mixins/ems_common.rb

@@ -105,7 +105,6 @@ def display_methods
           physical_switches
           physical_storages
           placement_groups
-          resource_pools_cloud
           security_groups
           security_policies
           security_policy_rules

app/controllers/mixins/generic_show_mixin.rb

@@ -151,8 +151,8 @@ def display_custom_button_events
       nested_list(CustomButtonEvent, :breadcrumb_title => _('Custom Button Events'), :clickable => false, :parent_method => 'custom_button_events')
     end
 
-    def display_resource_pools_cloud
-      nested_list(ManageIQ::Providers::CloudManager::ResourcePool, :breadcrumb_title => _('Resource Pools'))
+    def display_resource_pools
+      nested_list(ResourcePool)
     end
 
     def display_instances

app/controllers/resource_pool_infra_controller.rb → app/controllers/resource_pool_controller.rb

@@ -1,4 +1,4 @@
-class ResourcePoolInfraController < ApplicationController
+class ResourcePoolController < ApplicationController
   before_action :check_privileges
   before_action :get_session_data
   after_action :cleanup_action
@@ -21,57 +21,27 @@ def button
 
     @refresh_div = 'main_div' unless @display # Default div for button.rjs to refresh
     case params[:pressed]
-    when 'resource_pool_infra_delete'
-      deleteinfraresourcepools
+    when 'resource_pool_delete'
+      deleteresourcepools
       if @refresh_div == 'main_div' && @lastaction == 'show_list'
         replace_gtl_main_div
       else
         render_flash unless performed?
       end
-    when 'resource_pool_infra_protect'
+    when 'resource_pool_protect'
       assign_policies(ResourcePool)
-    when 'resource_pool_infra_tag'
-      tag(self.class.model)
     else
       super
     end
   end
 
-  def self.model
-    ManageIQ::Providers::InfraManager::ResourcePool
-  end
-
-  def self.table_name
-    @table_name ||= "resource_pool"
-  end
-
-  def breadcrumb_name(_model)
-    _("Infrastructure Resource Pools")
-  end
-
   def download_data
-    assert_privileges('resource_pool_infra_view')
+    assert_privileges('resource_pool_show_list')
     super
   end
 
   def download_summary_pdf
-    assert_privileges('resource_pool_infra_view')
-    super
-  end
-
-  def index
-    redirect_to(:action => 'show_list')
-  end
-
-  def show_list
-    assert_privileges('resource_pool_infra_show_list')
-    @center_toolbar = "resource_pool_infras"
-    super
-  end
-
-  def show
-    assert_privileges('resource_pool_infra_show')
-    @center_toolbar = "resource_pool_infra"
+    assert_privileges('resource_pool_show')
     super
   end
 
@@ -84,7 +54,6 @@ def record_class
   def textual_group_list
     [%i[properties relationships], %i[configuration smart_management]]
   end
-
   helper_method :textual_group_list
 
   def breadcrumbs_options
@@ -97,6 +66,6 @@ def breadcrumbs_options
     }
   end
 
-  menu_section :resource_pool_infra
+  menu_section :inf
   feature_for_actions "#{controller_name}_show_list", *ADV_SEARCH_ACTIONS
 end

app/controllers/vm_common.rb

@@ -362,10 +362,6 @@ def placement_group
     show_association('placement_groups', _('Placement Groups'), :placement_groups, PlacementGroup)
   end
 
-  def resource_pool
-    show_association('resource_pools', _('Resource Pools'), :resource_pools, ResourcePool)
-  end
-
   def cloud_subnets
     show_association('cloud_subnets', _('Subnets'), :cloud_subnets, CloudSubnet)
   end

app/helpers/application_helper.rb

@@ -394,10 +394,6 @@ def db_to_controller(db, action = "show")
     when "PlacementGroup"
       controller = "placement_group"
       action = "show"
-    when "ManageIQ::Providers::CloudManager::ResourcePool"
-      controller = "resource_pool_cloud"
-    when "ManageIQ::Providers::InfraManager::ResourcePool"
-      controller = "resource_pool_infra"
     when "SecurityGroup"
       controller = "security_group"
       action = "show"
@@ -800,8 +796,7 @@ def display_adv_search?
        physical_server
        placement_group
        provider_foreman
-       resource_pool_cloud
-       resource_pool_infra
+       resource_pool
        retired
        security_group
        security_policy

app/helpers/application_helper/listnav.rb

@@ -61,8 +61,7 @@ def render_listnav_filename
         physical_server
         physical_storage
         physical_switch
-        resource_pool_cloud
-        resource_pool_infra
+        resource_pool
         security_group
         security_policy
         security_policy_rule

app/helpers/application_helper/page_layouts.rb

@@ -220,8 +220,7 @@ def show_adv_search?
       physical_server
       physical_storage
       placement_group
-      resource_pool_cloud
-      resource_pool_infra
+      resource_pool
       retired
       security_group
       security_policy

app/helpers/application_helper/toolbar/resource_pool_infra_center.rb → app/helpers/application_helper/toolbar/resource_pool_center.rb

@@ -1,4 +1,4 @@
-class ApplicationHelper::Toolbar::ResourcePoolInfraCenter < ApplicationHelper::Toolbar::Basic
+class ApplicationHelper::Toolbar::ResourcePoolCenter < ApplicationHelper::Toolbar::Basic
   button_group('resource_pool_vmdb', [
     select(
       :resource_pool_vmdb_choice,
@@ -7,7 +7,7 @@ class ApplicationHelper::Toolbar::ResourcePoolInfraCenter < ApplicationHelper::T
       t,
       :items => [
         button(
-          :resource_pool_infra_delete,
+          :resource_pool_delete,
           'pficon pficon-delete fa-lg',
           N_('Remove this Resource Pool from Inventory'),
           N_('Remove Resource Pool from Inventory'),
@@ -24,12 +24,12 @@ class ApplicationHelper::Toolbar::ResourcePoolInfraCenter < ApplicationHelper::T
       t,
       :items => [
         button(
-          :resource_pool_infra_protect,
+          :resource_pool_protect,
           'pficon pficon-edit fa-lg',
           N_('Manage Policies for this Resource Pool'),
           N_('Manage Policies')),
         button(
-          :resource_pool_infra_tag,
+          :resource_pool_tag,
           'pficon pficon-edit fa-lg',
           N_('Edit Tags for this Resource Pool'),
           N_('Edit Tags')),