search for: production_mysqld_vm

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.

...t/functional/cloud/instance_controller_test.rb +++ b/src/test/functional/cloud/instance_controller_test.rb @@ -50,7 +50,7 @@ class Cloud::InstanceControllerTest < ActionController::TestCase def test_add_valid_task post(:index,{:submit_for_list => 'Shutdown', :ids => [vms(:production_mysqld_vm).id]}) - assert_equal('shutdown_vm successful.', flash[:notice]) + assert_equal('shutdown_vm submitted.', flash[:notice]) assert_redirected_to :action => :index, :ids => vms(:production_mysqld_vm).id end diff --git a/src/test/unit/vm_service_test.rb b/src/test/...

...iceModuleHelper + include VmService + fixtures :vms + + def setup + set_login_user('ovirtadmin') + end + + # Ensure correct message is returned for a valid action requested + # by a user with the proper permissions + def test_svc_vm_action_valid_user + assert_equal("#{vms(:production_mysqld_vm).description}: shutdown_vm was successfully queued.", + svc_vm_action(vms(:production_mysqld_vm).id, 'shutdown_vm', nil)) + end + + # Ensure that if a non-existant action is passed in, ActionError + # is thrown + def test_svc_vm_action_invalid_action + assert_raise ActionEr...

...b/src/test/fixtures/vms.yml index b2711b2..0d2caa3 100644 --- a/src/test/fixtures/vms.yml +++ b/src/test/fixtures/vms.yml @@ -11,8 +11,6 @@ production_httpd_vm: boot_device: hd host: prod_corp_com vm_resource_pool: corp_com_production_vmpool - forward_vnc: true - forward_vnc_port: 5901 production_mysqld_vm: uuid: 89e62d32-04d9-4351-b573-b1a253397296 description: production mysqld appliance diff --git a/src/test/unit/vm_test.rb b/src/test/unit/vm_test.rb index a28f183..d7b9d40 100644 --- a/src/test/unit/vm_test.rb +++ b/src/test/unit/vm_test.rb @@ -96,22 +96,6 @@ class VmTest < ActiveSupport:...

....c47eb68 100644 --- a/src/test/fixtures/vms.yml +++ b/src/test/fixtures/vms.yml @@ -5,7 +5,6 @@ production_httpd_vm: num_vcpus_used: 2 memory_allocated: 262144 memory_used: 131072 - vnic_mac_addr: 23:51:90:A1:13:37 state: stopped needs_restart: 0 boot_device: hd @@ -20,7 +19,6 @@ production_mysqld_vm: num_vcpus_used: 1 memory_allocated: 2048 memory_used: 512 - vnic_mac_addr: 15:99:FE:ED:11:EE state: running needs_restart: 0 boot_device: network @@ -33,7 +31,6 @@ production_ftpd_vm: num_vcpus_used: 1 memory_allocated: 1024 memory_used: 512 - vnic_mac_addr: FF:AA:BB:0...