From cf33f6190b3da56e4371606262e83f07e611689a Mon Sep 17 00:00:00 2001 From: Harpreet Kataria Date: Tue, 23 Feb 2021 10:30:46 -0500 Subject: [PATCH 1/2] Feature changes to support moving Configured Systems out of Ansible Tower Explorer - Added new alias to get Automation Manager Configured Systems --- .../automation_manager_configured_system.rb | 1 + db/fixtures/miq_product_features.yml | 38 +++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 app/models/aliases/automation_manager_configured_system.rb diff --git a/app/models/aliases/automation_manager_configured_system.rb b/app/models/aliases/automation_manager_configured_system.rb new file mode 100644 index 00000000000..9750e5de23a --- /dev/null +++ b/app/models/aliases/automation_manager_configured_system.rb @@ -0,0 +1 @@ +::AutomationManagerConfiguredSystem = ::ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml index f954d3dc8a8..3b4e4e152f3 100644 --- a/db/fixtures/miq_product_features.yml +++ b/db/fixtures/miq_product_features.yml @@ -5124,24 +5124,32 @@ :description: Add a Provider :feature_type: admin :identifier: automation_manager_add_provider - - :name: Configured Systems - :description: Everything under Configured Systems accordion - :feature_type: node - :identifier: automation_manager_configured_system +- :name: Configured Systems + :description: Everything under Configured Systems accordion + :feature_type: node + :identifier: automation_manager_configured_system + :children: + - :name: View + :description: View Configured Systems + :feature_type: view + :identifier: automation_manager_configured_system_view :children: - - :name: View - :description: View Configured Systems + - :name: List + :description: Display Lists of Configured Systems + :identifier: automation_manager_configured_system_show_list + - :name: Show + :description: Display Individual Configured Systems :feature_type: view - :identifier: automation_manager_configured_system_view - - :name: Operate - :description: Perform Operations on Configured Systems + :identifier: automation_manager_configured_system_show + - :name: Operate + :description: Perform Operations on Configured Systems + :feature_type: control + :identifier: automation_manager_configured_system_control + :children: + - :name: Edit Tags + :description: Edit Configured Systems Tags :feature_type: control - :identifier: automation_manager_configured_system_control - :children: - - :name: Edit Tags - :description: Edit Configured Systems Tags - :feature_type: control - :identifier: automation_manager_configured_system_tag + :identifier: automation_manager_configured_system_tag - :name: Templates :description: Everything under Templates accordion From 4e57e2d5a300c07a5279ba29a29b79356db1b123 Mon Sep 17 00:00:00 2001 From: Harpreet Kataria Date: Tue, 23 Feb 2021 13:09:08 -0500 Subject: [PATCH 2/2] Removed 'Ansible Tower' from dictionary entry --- locale/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en.yml b/locale/en.yml index 5d0cf592e74..274c3dfd12c 100644 --- a/locale/en.yml +++ b/locale/en.yml @@ -1522,7 +1522,7 @@ en: ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook: Playbook (Ansible Tower) ManageIQ::Providers::Foreman::ConfigurationManager: Configuration Manager (Foreman) ManageIQ::Providers::ConfigurationManager: Configuration Manager - ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem: Configured System (Ansible Tower) + ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem: Configured System ManageIQ::Providers::Foreman::ConfigurationManager::ConfiguredSystem: Configured System (Foreman) ManageIQ::Providers::AnsibleTower::AutomationManager::Job: Ansible Tower Job ManageIQ::Providers::CloudManager: Cloud Provider