Adding chassis to physical infra dashboard and adding racks and chass…

…is to provider's listnav
ManageIQ · Aug 30, 2018 · c14d857 · c14d857
1 parent 1023c1b
commit c14d857
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/app/decorators/physical_chassis_decorator.rb b/app/decorators/physical_chassis_decorator.rb
@@ -1,6 +1,6 @@
 class PhysicalChassisDecorator < MiqDecorator
   def self.fonticon
-    'pficon pficon-cluster'
+    'pficon pficon-template'
   end
 
   def quadicon

diff --git a/app/helpers/ems_physical_infra_helper/textual_summary.rb b/app/helpers/ems_physical_infra_helper/textual_summary.rb
@@ -14,7 +14,7 @@ def textual_group_properties
   def textual_group_relationships
     TextualGroup.new(
       _("Relationships"),
-      %i(physical_racks physical_chassis physical_switches physical_storages physical_servers datastores vms physical_servers_with_host)
+      %i(datastores physical_chassis physical_racks physical_servers physical_servers_with_host physical_storages physical_switches vms)
     )
   end
 

diff --git a/app/services/ems_physical_infra_dashboard_service.rb b/app/services/ems_physical_infra_dashboard_service.rb
@@ -34,23 +34,30 @@ def servers_group_data
   end
 
   def attributes_data
-    attributes = %i(physical_servers physical_switches physical_racks physical_storages)
+    attributes = %i(physical_chassis
+                    physical_servers
+                    physical_switches
+                    physical_racks
+                    physical_storages)
 
     attr_icon = {
+      :physical_chassis  => 'pficon pficon-cluster',
       :physical_servers  => 'pficon pficon-cluster',
       :physical_switches => 'pficon ff ff-network-switch',
       :physical_racks    => 'pficon pficon-enterprise',
       :physical_storages => 'pficon pficon-container-node',
     }
 
     attr_url = {
+      :physical_chassis  => 'physical_chassis',
       :physical_servers  => 'physical_servers',
       :physical_switches => 'physical_switches',
       :physical_racks    => 'physical_racks',
       :physical_storages => 'physical_storages',
     }
 
     attr_hsh = {
+      :physical_chassis  => _('Chassis'),
       :physical_servers  => _('Servers'),
       :physical_switches => _('Switches'),
       :physical_racks    => _('Racks'),

diff --git a/app/views/layouts/listnav/_ems_physical_infra.html.haml b/app/views/layouts/listnav/_ems_physical_infra.html.haml
@@ -15,6 +15,14 @@
     = miq_accordion_panel(_("Relationships"), false, "ems_rel") do
       %ul.nav.nav-pills.nav-stacked
         %li
+          = li_link(:count => @record.number_of(:physical_chassis),
+            :tables        => 'physical_chassis',
+            :record        => @record,
+            :display       => 'physical_chassis')
+          = li_link(:count => @record.number_of(:physical_racks),
+            :tables        => 'physical_racks',
+            :record        => @record,
+            :display       => 'physical_racks')
           = li_link(:count => @record.number_of(:physical_servers),
             :tables        => 'physical_servers',
             :record        => @record,

diff --git a/spec/helpers/ems_physical_infra_helper/textual_summary_spec.rb b/spec/helpers/ems_physical_infra_helper/textual_summary_spec.rb
@@ -10,14 +10,14 @@
   include_examples "textual_group", "Overview", %i(topology), "topology"
 
   include_examples "textual_group", "Relationships", %i(
-    physical_racks
+    datastores
     physical_chassis
-    physical_switches
-    physical_storages
+    physical_racks
     physical_servers
-    datastores
-    vms
     physical_servers_with_host
+    physical_storages
+    physical_switches
+    vms
   )
 
   include_examples "textual_group_smart_management", %i(zone)