Merge pull request ManageIQ#8998 from kbrock/network_vms

filter vms displayed in tree lan

app/presenters/tree_builder_network.rb

@@ -27,21 +27,18 @@ def root_options
   end
 
   def x_get_tree_roots
-    @root.switches.empty? ? [] : count_only_or_objects(false, @root.switches)
+    Rbac.filtered(@root.switches)
   end
 
   def x_get_tree_switch_kids(parent, count_only)
-    objects = []
-    objects.concat(parent.guest_devices) unless parent.guest_devices.empty?
-    objects.concat(parent.lans) unless parent.lans.empty?
-    count_only_or_objects(count_only, objects)
+    count_only_or_objects_filtered(count_only, parent.guest_devices) + count_only_or_objects_filtered(count_only, parent.lans)
   end
 
   def x_get_tree_lan_kids(parent, count_only)
-    kids = count_only ? 0 : []
-    if parent.respond_to?("vms_and_templates") && parent.vms_and_templates.present?
-      kids = count_only_or_objects(count_only, parent.vms_and_templates, "name")
+    if parent.respond_to?(:vms_and_templates)
+      count_only_or_objects_filtered(count_only, parent.vms_and_templates, "name")
+    else
+      count_only ? 0 : []
     end
-    kids
   end
 end

spec/presenters/tree_builder_network_spec.rb

@@ -1,6 +1,7 @@
 describe TreeBuilderNetwork do
   context 'TreeBuilderNetwork' do
     before do
+      EvmSpecHelper.local_miq_server
       role = MiqUserRole.find_by(:name => "EvmRole-operator")
       @group = FactoryBot.create(:miq_group, :miq_user_role => role, :description => "Network Group")
       login_as FactoryBot.create(:user, :userid => 'network_wilma', :miq_groups => [@group])
@@ -37,6 +38,7 @@
     end
 
     it 'returns Vm as Lan child' do
+      EvmSpecHelper.local_miq_server
       parent = @network_tree.send(:x_get_tree_roots).first.lans.first
       kid = @network_tree.send(:x_get_tree_lan_kids, parent, false)
       expect(kid.first).to be_a_kind_of(Vm)