From 7337a2ef7ad01025bcd258e9c5056312b048f6e3 Mon Sep 17 00:00:00 2001 From: Julian Cheal Date: Thu, 19 Jan 2017 17:14:39 +0000 Subject: [PATCH 1/3] Adding Physical Infra Providers Menu Item Also adds start of translations. This PR is a requirement of a follow up PR on the manageiq-classic-ui --- app/models/aliases/ems_physical_infra.rb | 1 + db/fixtures/miq_product_features.yml | 57 +++++++++++++ ...nageIQ_Providers_PhysicalInfraManager.yaml | 84 +++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 app/models/aliases/ems_physical_infra.rb create mode 100644 product/views/ManageIQ_Providers_PhysicalInfraManager.yaml diff --git a/app/models/aliases/ems_physical_infra.rb b/app/models/aliases/ems_physical_infra.rb new file mode 100644 index 00000000000..3f66c0403ff --- /dev/null +++ b/app/models/aliases/ems_physical_infra.rb @@ -0,0 +1 @@ +::EmsPhysicalInfra = ::ManageIQ::Providers::PhysicalInfraManager diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml index 5c419a5e239..1b3c0f6389e 100644 --- a/db/fixtures/miq_product_features.yml +++ b/db/fixtures/miq_product_features.yml @@ -6030,6 +6030,63 @@ :feature_type: view :identifier: ems_object_storage_timeline +# EmsPhysicalInfra +- :name: Physical Infra Providers + :description: Everything under Physical Infra Providers + :feature_type: node + :identifier: ems_physical_infra + :children: + - :name: View + :description: View Physical Infra Providers + :feature_type: view + :identifier: ems_physical_infra_view + :children: + - :name: List + :description: Display Lists of Physical Infra Providers + :feature_type: view + :identifier: ems_physical_infra_show_list + - :name: Show + :description: Display Individual Physical Infra Providers + :feature_type: view + :identifier: ems_physical_infra_show + - :name: Modify + :description: Modify Physical Infra Providers + :feature_type: admin + :identifier: ems_physical_infra_admin + :children: + - :name: Remove + :description: Remove Physical Infra Provider + :feature_type: admin + :identifier: ems_physical_infra_delete + - :name: Edit + :description: Edit a Physical Infra Provider + :feature_type: admin + :identifier: ems_physical_infra_edit + - :name: Add + :description: Add a Physical Infra Provider + :feature_type: admin + :identifier: ems_physical_infra_new + +# Physical Servers +- :name: Physical Servers + :description: Everything under Physical Infra Servers + :feature_type: node + :identifier: physical_server + :children: + - :name: View + :description: View Physical Server + :feature_type: view + :identifier: physical_server_view + :children: + - :name: List + :description: Display Lists of Physical Servers + :feature_type: view + :identifier: shosical_server_show_list + - :name: Show + :description: Display Individual Physical Server + :feature_type: view + :identifier: physical_server_show + # Monitor - :name: Monitor :description: Everything under Monitor diff --git a/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml b/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml new file mode 100644 index 00000000000..91c309fe77f --- /dev/null +++ b/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml @@ -0,0 +1,84 @@ +# +# This is an MIQ Report configuration file +# Single value parameters are specified as: +# single_value_parm: value +# Multiple value parameters are specified as: +# multi_value_parm: +# - value 1 +# - value 2 +# + +# Report title +title: Physical Infrastructure Providers +# Menu name +name: EmsPhysicalInfra +# Main DB table report is based on +db: EmsPhysicalInfra +# Columns to fetch from the main table +cols: +- name +- hostname +- ipaddress +- emstype_description +- port +- total_hosts +- total_storages +- total_vms +- total_miq_templates +- region_description +# Included tables (joined, has_one, has_many) and columns +include: + zone: + columns: + - name +# Included tables and columns for query performance +include_for_find: + :zone: {} + :tags: {} +# Order of columns (from all tables) +col_order: +- name +- hostname +- ipaddress +- emstype_description +- zone.name +- total_hosts +- total_storages +- total_vms +- total_miq_templates +- region_description +# Column titles, in order +headers: +- Name +- Hostname +- Discovered IP Address +- Type +- EVM Zone +- Hosts +- Datastores +- VMs +- Templates +- Region +# Condition(s) string for the SQL query +conditions: +# Order string for the SQL query +order: Ascending +# Columns to sort the report on, in order +sortby: +- name +# Group rows (y=yes,n=no,c=count) +group: n +# Graph type +# Bar +# Column +# ColumnThreed +# ParallelThreedColumn +# Pie +# PieThreed +# StackedBar +# StackedColumn +# StackedThreedColumn +graph: +# Dimensions of graph (1 or 2) +# Note: specifying 2 for a single dimension graph may not return expected results +dims: From eb0760a1590ab642e21e192aa84bb5bf971cd8a6 Mon Sep 17 00:00:00 2001 From: Aparna Karve Date: Mon, 30 Jan 2017 11:22:56 -0800 Subject: [PATCH 2/3] Product Feature adjustments --- db/fixtures/miq_product_features.yml | 47 ++++++++++++++++++++++------ db/fixtures/miq_user_roles.yml | 31 ++++++++++++++++++ 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml index 1b3c0f6389e..4b47ec8ad57 100644 --- a/db/fixtures/miq_product_features.yml +++ b/db/fixtures/miq_product_features.yml @@ -6031,39 +6031,68 @@ :identifier: ems_object_storage_timeline # EmsPhysicalInfra -- :name: Physical Infra Providers - :description: Everything under Physical Infra Providers +- :name: Physical Infrastructure Providers + :description: Everything under Physical Infrastructure Providers :feature_type: node :identifier: ems_physical_infra :children: - :name: View - :description: View Physical Infra Providers + :description: View Physical Infrastructure Providers :feature_type: view :identifier: ems_physical_infra_view :children: - :name: List - :description: Display Lists of Physical Infra Providers + :description: Display List of Physical Infrastructure Providers :feature_type: view :identifier: ems_physical_infra_show_list - :name: Show - :description: Display Individual Physical Infra Providers + :description: Display Individual Physical Infrastructure Providers :feature_type: view :identifier: ems_physical_infra_show + - :name: Timeline + :description: Display Timelines for Physical Infrastructure Providers + :feature_type: view + :identifier: ems_physical_infra_timeline + - :name: Operate + :description: Perform Operations on Physical Infrastructure Providers + :feature_type: control + :identifier: ems_physical_infra_control + :children: + - :name: Edit Tags + :description: Edit Tags of Physical Infrastructure Providers + :feature_type: control + :identifier: ems_physical_infra_tag + - :name: Manage Policies + :description: Manage Policies of Physical Infrastructure Providers + :feature_type: control + :identifier: ems_physical_infra_protect + - :name: Check Compliance + :description: Check Compliance of Last Known Configuration + :feature_type: control + :identifier: ems_physical_infra_check_compliance + - :name: Refresh + :description: Refresh Physical Infrastructure Providers + :feature_type: control + :identifier: ems_physical_infra_refresh + - :name: Re-check Authentication Status + :description: Re-check Authentication Status of Physical Infrastructure Providers + :feature_type: control + :identifier: ems_physical_infra_recheck_auth_status - :name: Modify - :description: Modify Physical Infra Providers + :description: Modify Physical Infrastructure Providers :feature_type: admin :identifier: ems_physical_infra_admin :children: - :name: Remove - :description: Remove Physical Infra Provider + :description: Remove Physical Infrastructure Providers :feature_type: admin :identifier: ems_physical_infra_delete - :name: Edit - :description: Edit a Physical Infra Provider + :description: Edit a Physical Infrastructure Provider :feature_type: admin :identifier: ems_physical_infra_edit - :name: Add - :description: Add a Physical Infra Provider + :description: Add a Physical Infrastructure Provider :feature_type: admin :identifier: ems_physical_infra_new diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml index 4ed76bd28ed..80d41502a6c 100644 --- a/db/fixtures/miq_user_roles.yml +++ b/db/fixtures/miq_user_roles.yml @@ -32,6 +32,7 @@ - ems_network - ems_cluster - ems_infra + - ems_physical_infra - container_dashboard - ems_container - ems_container_deployment @@ -128,6 +129,10 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_show - host_show_list - host_perf @@ -236,6 +241,10 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_show - host_show_list - host_perf @@ -404,6 +413,14 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_new + - ems_physical_infra_delete + - ems_physical_infra_edit + - ems_physical_infra_refresh + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_new - host_analyze - host_compare @@ -530,6 +547,10 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_show - host_show_list - host_perf @@ -627,6 +648,10 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_show - host_show_list - host_perf @@ -720,6 +745,10 @@ - ems_infra_show_list - ems_infra_tag - ems_infra_timeline + - ems_physical_infra_show + - ems_physical_infra_show_list + - ems_physical_infra_tag + - ems_physical_infra_timeline - host_show - host_show_list - host_perf @@ -974,6 +1003,7 @@ - ems_network - ems_cluster - ems_infra + - ems_physical_infra - host - job_all_smartproxy - job_my_smartproxy @@ -1041,6 +1071,7 @@ - ems_cloud - ems_cluster - ems_infra + - ems_physical_infra - host - job_all_smartproxy - job_my_smartproxy From 7a25ba87a94bc398a7dd7290b554c052755b2398 Mon Sep 17 00:00:00 2001 From: Aparna Karve Date: Mon, 30 Jan 2017 12:35:27 -0800 Subject: [PATCH 3/3] Clean up ^M characters at the end of line --- ...nageIQ_Providers_PhysicalInfraManager.yaml | 168 +++++++++--------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml b/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml index 91c309fe77f..b9679e16cc1 100644 --- a/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml +++ b/product/views/ManageIQ_Providers_PhysicalInfraManager.yaml @@ -1,84 +1,84 @@ -# -# This is an MIQ Report configuration file -# Single value parameters are specified as: -# single_value_parm: value -# Multiple value parameters are specified as: -# multi_value_parm: -# - value 1 -# - value 2 -# - -# Report title -title: Physical Infrastructure Providers -# Menu name -name: EmsPhysicalInfra -# Main DB table report is based on -db: EmsPhysicalInfra -# Columns to fetch from the main table -cols: -- name -- hostname -- ipaddress -- emstype_description -- port -- total_hosts -- total_storages -- total_vms -- total_miq_templates -- region_description -# Included tables (joined, has_one, has_many) and columns -include: - zone: - columns: - - name -# Included tables and columns for query performance -include_for_find: - :zone: {} - :tags: {} -# Order of columns (from all tables) -col_order: -- name -- hostname -- ipaddress -- emstype_description -- zone.name -- total_hosts -- total_storages -- total_vms -- total_miq_templates -- region_description -# Column titles, in order -headers: -- Name -- Hostname -- Discovered IP Address -- Type -- EVM Zone -- Hosts -- Datastores -- VMs -- Templates -- Region -# Condition(s) string for the SQL query -conditions: -# Order string for the SQL query -order: Ascending -# Columns to sort the report on, in order -sortby: -- name -# Group rows (y=yes,n=no,c=count) -group: n -# Graph type -# Bar -# Column -# ColumnThreed -# ParallelThreedColumn -# Pie -# PieThreed -# StackedBar -# StackedColumn -# StackedThreedColumn -graph: -# Dimensions of graph (1 or 2) -# Note: specifying 2 for a single dimension graph may not return expected results -dims: +# +# This is an MIQ Report configuration file +# Single value parameters are specified as: +# single_value_parm: value +# Multiple value parameters are specified as: +# multi_value_parm: +# - value 1 +# - value 2 +# + +# Report title +title: Physical Infrastructure Providers +# Menu name +name: EmsPhysicalInfra +# Main DB table report is based on +db: EmsPhysicalInfra +# Columns to fetch from the main table +cols: +- name +- hostname +- ipaddress +- emstype_description +- port +- total_hosts +- total_storages +- total_vms +- total_miq_templates +- region_description +# Included tables (joined, has_one, has_many) and columns +include: + zone: + columns: + - name +# Included tables and columns for query performance +include_for_find: + :zone: {} + :tags: {} +# Order of columns (from all tables) +col_order: +- name +- hostname +- ipaddress +- emstype_description +- zone.name +- total_hosts +- total_storages +- total_vms +- total_miq_templates +- region_description +# Column titles, in order +headers: +- Name +- Hostname +- Discovered IP Address +- Type +- EVM Zone +- Hosts +- Datastores +- VMs +- Templates +- Region +# Condition(s) string for the SQL query +conditions: +# Order string for the SQL query +order: Ascending +# Columns to sort the report on, in order +sortby: +- name +# Group rows (y=yes,n=no,c=count) +group: n +# Graph type +# Bar +# Column +# ColumnThreed +# ParallelThreedColumn +# Pie +# PieThreed +# StackedBar +# StackedColumn +# StackedThreedColumn +graph: +# Dimensions of graph (1 or 2) +# Note: specifying 2 for a single dimension graph may not return expected results +dims: