search for: production_httpd_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.

...uccessfully 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 ActionError do + svc_vm_action(vms(:production_httpd_vm).id, 'stop_vm', nil) + end + end + + # Ensure that if a user with the wrong permissions is passed in, + # PermissionError is thrown + def test_svc_vm_action_invalid_user + set_login_user('fred') + assert_raise PermissionError do + svc_vm_action(vms(:production_mysq...

...th: 100 host: mediaserver_managed_node - physical_network: mediaserver_network_two + network: mediaserver_network_two diff --git a/src/test/fixtures/vms.yml b/src/test/fixtures/vms.yml index 69b1c2b..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...

...nctional/vm_controller_test.rb index c7769dd..a059c50 100644 --- a/src/test/functional/vm_controller_test.rb +++ b/src/test/functional/vm_controller_test.rb @@ -32,9 +32,10 @@ class VmControllerTest < Test::Unit::TestCase @response = ActionController::TestResponse.new @vm_id = vms(:production_httpd_vm).id - @default_pool = pools(:default) + @vm_pool = pools(:corp_com_production_vmpool) end + def test_show get :show, :id => @vm_id @@ -46,23 +47,22 @@ class VmControllerTest < Test::Unit::TestCase end def test_new - get :new, :hardware_pool_id => @default_po...

...+ fk_vm_host_histories_hosts foreign key (host_id) references + hosts(id)" + + end +end + diff --git a/src/test/fixtures/vms.yml 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...