Merge pull request #6277 from h-kataria/fix_netowrk_port_summary

Fix loading of Network Port details screen
ManageIQ · Oct 8, 2019 · f10324a · f10324a
2 parents 163f602 + 09231fa
commit f10324a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/app/helpers/network_port_helper/textual_summary.rb b/app/helpers/network_port_helper/textual_summary.rb
@@ -59,6 +59,8 @@ def textual_device
         h[:title] = _("Show Instance")
       end
       h
+    elsif device.kind_of?(LoadBalancer)
+      device.name
     else
       device
     end

diff --git a/spec/shared/controllers/shared_network_manager_context.rb b/spec/shared/controllers/shared_network_manager_context.rb
@@ -47,6 +47,16 @@
                                                             :security_groups       => [@security_group],
                                                             :floating_ip           => @floating_ip,
                                                             :ext_management_system => @ems)
+
+    @load_balancer = FactoryBot.create(:load_balancer)
+    @load_balancer.network_ports << @network_port = FactoryBot.create("network_port_#{t}".to_sym,
+                                                                      :name                  => "eth0",
+                                                                      :mac_address           => "06:04:25:40:8e:79",
+                                                                      :device                => @load_balancer,
+                                                                      :security_groups       => [@security_group],
+                                                                      :floating_ip           => @floating_ip,
+                                                                      :ext_management_system => @ems)
+
     FactoryBot.create(:cloud_subnet_network_port,
                        :cloud_subnet => @cloud_subnet,
                        :network_port => @network_port,