Update Resource Pool Product Features

db/fixtures/miq_product_features.yml

@@ -1402,47 +1402,89 @@
       :feature_type: admin
       :identifier: host_provide
 
-# Resource Pools
-- :name: Resource Pools
-  :description: Access Everything under Resource Pools
+# Cloud Resource Pools
+- :name: Cloud Resource Pools
+  :description: Access Everything under Cloud Resource Pools
   :feature_type: node
-  :identifier: resource_pool
+  :identifier: resource_pool_cloud
   :children:
   - :name: View
-    :description: Display Lists of Resource Pools
+    :description: Display Lists of Cloud Resource Pools
     :feature_type: view
-    :identifier: resource_pool_view
+    :identifier: resource_pool_cloud_view
     :children:
     - :name: List
-      :description: Display Lists of Resource Pools
+      :description: Display Lists of Cloud Resource Pools
       :feature_type: view
-      :identifier: resource_pool_show_list
+      :identifier: resource_pool_cloud_show_list
     - :name: Show
-      :description: Display Individual Resource Pools
+      :description: Display Individual Cloud Resource Pools
       :feature_type: view
-      :identifier: resource_pool_show
+      :identifier: resource_pool_cloud_show
   - :name: Operate
-    :description: Perform Operations on Resource Pools
+    :description: Perform Operations on Cloud Resource Pools
     :feature_type: control
-    :identifier: resource_pool_control
+    :identifier: resource_pool_cloud_control
     :children:
     - :name: Edit Tags
-      :description: Edit Tags of Resource Pools
+      :description: Edit Tags of Cloud Resource Pools
       :feature_type: control
-      :identifier: resource_pool_tag
+      :identifier: resource_pool_cloud_tag
     - :name: Manage Policies
-      :description: Manage Policies of Resource Pools
+      :description: Manage Policies of Cloud Resource Pools
       :feature_type: control
-      :identifier: resource_pool_protect
+      :identifier: resource_pool_cloud_protect
   - :name: Modify
-    :description: Modify Resource Pools
+    :description: Modify Cloud Resource Pools
     :feature_type: admin
-    :identifier: resource_pool_admin
+    :identifier: resource_pool_cloud_admin
     :children:
     - :name: Remove
-      :description: Remove Resource Pools
+      :description: Remove Cloud Resource Pools
       :feature_type: admin
-      :identifier: resource_pool_delete
+      :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
 
 # Datastores
 - :name: Datastores

db/fixtures/miq_shortcuts.yml

@@ -154,10 +154,15 @@
   :url: /vm_infra/explorer?accordion=templates_filter
   :rbac_feature_name: templates_filter_accord
   :startup: true
-- :name: resource_pools
-  :description: Compute / Infrastructure / Resource Pools
-  :url: /resource_pool/show_list
-  :rbac_feature_name: resource_pool_show_list
+- :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
   :startup: true
 - :name: storage
   :description: Compute / Infrastructure / Datastores

db/fixtures/miq_user_roles.yml

@@ -81,7 +81,8 @@
   - physical_infra_topology
   - policy_import_export
   - pxe
-  - resource_pool
+  - resource_pool_cloud
+  - resource_pool_infra
   - security_group
   - service
   - timeline
@@ -161,9 +162,12 @@
   - rbac_group_view
   - rbac_group_operate
   - rbac_tenant_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_coud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -258,9 +262,12 @@
   - policy_simulation
   - pxe_image_type_view
   - pxe_server_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -354,9 +361,12 @@
   - policy_simulation
   - pxe_image_type_view
   - pxe_server_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -542,9 +552,12 @@
   - miq_template_tag
   - miq_template_timeline
   - pxe
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_delete
   - storage_scan
@@ -640,9 +653,12 @@
   - policy_log
   - policy_simulation
   - physical_server_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -726,9 +742,12 @@
   - physical_storage_view
   - policy_log
   - policy_simulation
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -812,9 +831,12 @@
   - physical_switch_view
   - physical_server_view
   - physical_storage_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_show
   - storage_show_list
@@ -901,9 +923,12 @@
   - physical_server_view
   - physical_storage_view
   - physical_switch_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - storage_perf
   - storage_show
@@ -1077,9 +1102,12 @@
   - rbac_group_view
   - rbac_group_operate
   - rbac_tenant_view
-  - resource_pool_show
-  - resource_pool_show_list
-  - resource_pool_tag
+  - resource_pool_cloud_show
+  - resource_pool_cloud_show_list
+  - resource_pool_cloud_tag
+  - resource_pool_infra_show
+  - resource_pool_infra_show_list
+  - resource_pool_infra_tag
   - service_view
   - st_catalog_view
   - st_catalog_edit
@@ -1308,7 +1336,8 @@
   - rbac_role_view
   - rbac_tenant
   - rbac_user
-  - resource_pool
+  - resource_pool_cloud
+  - resource_pool_infra
   - security_group
   - service
   - timeline
@@ -1364,7 +1393,8 @@
   - pxe
   - rbac_tenant_view
   - rbac_tenant_manage_quotas
-  - resource_pool
+  - resource_pool_cloud
+  - resource_pool_infra
   - security_group
   - service
   - timeline
@@ -1560,7 +1590,8 @@
   - rbac_role_view
   - rbac_tenant_view
   - rbac_user_view
-  - resource_pool_view
+  - resource_pool_cloud_view
+  - resource_pool_infra_view
   - security_group_view
   - service_view
   - st_catalog_view