Merge pull request #167 from jntullo/bug/vnc_console

Add decorator for VNC Console
ManageIQ · Nov 3, 2017 · 9957510 · 9957510
2 parents efe7610 + 57943ce
commit 9957510
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/controllers/api/subcollections/vms.rb b/app/controllers/api/subcollections/vms.rb
@@ -47,6 +47,9 @@ def create_vm_decorators_hash(vm_decorators, vm)
         if vm_decorators.include? 'supports_cockpit?'
           hash['supports_cockpit?'] = vm.supports_launch_cockpit?
         end
+        if vm_decorators.include?('supports_vnc_console?')
+          hash['supports_vnc_console?'] = vm.console_supported?('VNC')
+        end
         hash
       end
     end

diff --git a/spec/requests/services_spec.rb b/spec/requests/services_spec.rb
@@ -473,11 +473,11 @@ def expect_svc_with_vms
     end
 
     it "can query vms as subcollection via decorators with additional decorators" do
-      get api_service_url(nil, svc1), :params => { :expand => "vms", :attributes => "", :decorators => "vms.supports_console?" }
+      get api_service_url(nil, svc1), :params => { :expand => "vms", :attributes => "", :decorators => "vms.supports_console?,vms.supports_cockpit?,vms.supports_vnc_console?" }
 
       expect_svc_with_vms
-      expect_results_to_match_hash("vms", [{"id" => vm1.id.to_s, "supports_console?" => true},
-                                           {"id" => vm2.id.to_s, "supports_console?" => true}])
+      expect_results_to_match_hash("vms", [{"id" => vm1.id.to_s, "supports_console?" => true, "supports_cockpit?" => anything, "supports_vnc_console?" => anything},
+                                           {"id" => vm2.id.to_s, "supports_console?" => true, "supports_cockpit?" => anything, "supports_vnc_console?" => anything}])
     end
 
     it "cannot query vms via both virtual attribute and subcollection" do