Merge pull request #23169 from agrare/revert_cloud_resource_pools

Revert "Merge pull request #22879 from Guddetisandeep/resource_pool"
ManageIQ · Aug 30, 2024 · 87f5837 · 87f5837
2 parents e5a568d + 2c0156e
commit 87f5837
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 71 deletions.
diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
@@ -1402,89 +1402,47 @@
       :feature_type: admin
       :identifier: host_provide
 
-# Cloud Resource Pools
-- :name: Cloud Resource Pools
-  :description: Access Everything under Cloud Resource Pools
+# Resource Pools
+- :name: Resource Pools
+  :description: Access Everything under Resource Pools
   :feature_type: node
-  :identifier: resource_pool_cloud
+  :identifier: resource_pool
   :children:
   - :name: View
-    :description: Display Lists of Cloud Resource Pools
+    :description: Display Lists of Resource Pools
     :feature_type: view
-    :identifier: resource_pool_cloud_view
+    :identifier: resource_pool_view
     :children:
     - :name: List
-      :description: Display Lists of Cloud Resource Pools
+      :description: Display Lists of Resource Pools
       :feature_type: view
-      :identifier: resource_pool_cloud_show_list
+      :identifier: resource_pool_show_list
     - :name: Show
-      :description: Display Individual Cloud Resource Pools
+      :description: Display Individual Resource Pools
       :feature_type: view
-      :identifier: resource_pool_cloud_show
+      :identifier: resource_pool_show
   - :name: Operate
-    :description: Perform Operations on Cloud Resource Pools
+    :description: Perform Operations on Resource Pools
     :feature_type: control
-    :identifier: resource_pool_cloud_control
+    :identifier: resource_pool_control
     :children:
     - :name: Edit Tags
-      :description: Edit Tags of Cloud Resource Pools
+      :description: Edit Tags of Resource Pools
       :feature_type: control
-      :identifier: resource_pool_cloud_tag
+      :identifier: resource_pool_tag
     - :name: Manage Policies
-      :description: Manage Policies of Cloud Resource Pools
+      :description: Manage Policies of Resource Pools
       :feature_type: control
-      :identifier: resource_pool_cloud_protect
+      :identifier: resource_pool_protect
   - :name: Modify
-    :description: Modify Cloud Resource Pools
+    :description: Modify Resource Pools
     :feature_type: admin
-    :identifier: resource_pool_cloud_admin
+    :identifier: resource_pool_admin
     :children:
     - :name: Remove
-      :description: Remove Cloud Resource Pools
+      :description: Remove Resource Pools
       :feature_type: admin
-      :identifier: resource_pool_cloud_delete
-
-# Infrastructure Resource Pools
-- :name: Infrastructure Resource Pools
-  :description: Access Everything under Infrastructure Resource Pools
-  :feature_type: node
-  :identifier: resource_pool_infra
-  :children:
-  - :name: View
-    :description: Display Lists of Infrastructure Resource Pools
-    :feature_type: view
-    :identifier: resource_pool_infra_view
-    :children:
-    - :name: List
-      :description: Display Lists of Infrastructure Resource Pools
-      :feature_type: view
-      :identifier: resource_pool_infra_show_list
-    - :name: Show
-      :description: Display Individual Infrastructure Resource Pools
-      :feature_type: view
-      :identifier: resource_pool_infra_show
-  - :name: Operate
-    :description: Perform Operations on Infrastructure Resource Pools
-    :feature_type: control
-    :identifier: resource_pool_infra_control
-    :children:
-    - :name: Edit Tags
-      :description: Edit Tags of Infrastructure Resource Pools
-      :feature_type: control
-      :identifier: resource_pool_infra_tag
-    - :name: Manage Policies
-      :description: Manage Policies of Infrastructure Resource Pools
-      :feature_type: control
-      :identifier: resource_pool_infra_protect
-  - :name: Modify
-    :description: Modify Infrastructure Resource Pools
-    :feature_type: admin
-    :identifier: resource_pool_infra_admin
-    :children:
-    - :name: Remove
-      :description: Remove Infrastructure Resource Pools
-      :feature_type: admin
-      :identifier: resource_pool_infra_delete
+      :identifier: resource_pool_delete
 
 # Datastores
 - :name: Datastores

diff --git a/db/fixtures/miq_shortcuts.yml b/db/fixtures/miq_shortcuts.yml
@@ -154,15 +154,10 @@
   :url: /vm_infra/explorer?accordion=templates_filter
   :rbac_feature_name: templates_filter_accord
   :startup: true
-- :name: resource_pool_cloud
-  :description: Compute / Clouds / Cloud Resource Pools
-  :url: /resource_pool_cloud/show_list
-  :rbac_feature_name: resource_pool_cloud_show_list
-  :startup: true
-- :name: resource_pool_infra
-  :description: Compute / Infrastructure / Infrastructure Resource Pools
-  :url: /resource_pool_infra/show_list
-  :rbac_feature_name: resource_pool_infra_show_list
+- :name: resource_pools
+  :description: Compute / Infrastructure / Resource Pools
+  :url: /resource_pool/show_list
+  :rbac_feature_name: resource_pool_show_list
   :startup: true
 - :name: storage
   :description: Compute / Infrastructure / Datastores