Merge pull request #4783 from skovic/move-connected-servers

Move connected physical servers to the Relationships table (cherry picked from commit d3bb89a) https://bugzilla.redhat.com/show_bug.cgi?id=1640732
ManageIQ · Oct 25, 2018 · 52e34f6 · 52e34f6
1 parent bd81cce
commit 52e34f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/app/controllers/physical_switch_controller.rb b/app/controllers/physical_switch_controller.rb
@@ -31,7 +31,7 @@ def show_list
   def textual_group_list
     [
       %i(properties management_networks relationships),
-      %i(power_management firmware_details connected_components),
+      %i(power_management firmware_details),
     ]
   end
   helper_method(:textual_group_list)

diff --git a/app/helpers/physical_switch_helper/textual_summary.rb b/app/helpers/physical_switch_helper/textual_summary.rb
@@ -11,7 +11,7 @@ def textual_group_properties
   def textual_group_relationships
     TextualGroup.new(
       _("Relationships"),
-      %i(ext_management_system)
+      %i(ext_management_system connected_physical_servers)
     )
   end
 
@@ -30,13 +30,6 @@ def textual_group_firmware_details
     TextualTable.new(_("Firmwares"), firmware_details, [_("Name"), _("Version")])
   end
 
-  def textual_group_connected_components
-    TextualGroup.new(
-      _("Connected Components"),
-      %i(connected_physical_servers)
-    )
-  end
-
   def textual_ports
     ports_count = @record.physical_network_ports.count
     ports = {:label => _("Ports"), :value => ports_count, :icon => PhysicalNetworkPortDecorator.fonticon}

diff --git a/spec/helpers/physical_switch_helper/textual_summary_spec.rb b/spec/helpers/physical_switch_helper/textual_summary_spec.rb
@@ -11,9 +11,7 @@
     description
   )
 
-  include_examples "textual_group", "Relationships", %i(ext_management_system)
+  include_examples "textual_group", "Relationships", %i(ext_management_system connected_physical_servers)
 
   include_examples "textual_group", "Power Management", %i(power_state), "power_management"
-
-  include_examples "textual_group", "Connected Components", %i(connected_physical_servers), "connected_components"
 end