From b53eca5707329b132563178b29b847e8863fab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 27 Apr 2015 16:38:37 +0200 Subject: [PATCH] Feature #3654: Remove boot action from oneflow --- src/flow/lib/models/role.rb | 20 ++++++++----- src/oca/ruby/opennebula/oneflow_client.rb | 1 - src/sunstone/etc/sunstone-views/admin.yaml | 2 -- .../etc/sunstone-views/admin_vcenter.yaml | 2 -- src/sunstone/etc/sunstone-views/user.yaml | 2 -- .../public/js/plugins/oneflow-services.js | 30 ------------------- 6 files changed, 13 insertions(+), 44 deletions(-) diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb index 74a69070a3..18e9576e46 100644 --- a/src/flow/lib/models/role.rb +++ b/src/flow/lib/models/role.rb @@ -24,18 +24,20 @@ module OpenNebula # Actions that can be performed on the VMs of a given Role SCHEDULE_ACTIONS = [ 'shutdown', - 'delete', + 'shutdown-hard', + 'undeploy', + 'undeploy-hard', 'hold', 'release', 'stop', - 'shutdown-hard', 'suspend', 'resume', - 'boot', + 'delete', 'delete-recreate', 'reboot', 'reboot-hard', 'poweroff', + 'poweroff-hard', 'snapshot-create' ] @@ -823,7 +825,7 @@ module OpenNebula set_cardinality( get_nodes.size() - nodes_dispose.size() ) end - # Deletes VMs in DONE or FAILED, and sends a boot action to VMs in UNKNOWN + # Deletes VMs in DONE or FAILED, and sends a resume action to VMs in UNKNOWN def recover() nodes = @body['nodes'] @@ -861,13 +863,17 @@ module OpenNebula new_nodes << node end + elsif (vm_state == '3' && lcm_state == '16') # UNKNOWN + vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) + vm.resume + + new_nodes << node elsif (vm_state == '3' && - (lcm_state == '16' || # UNKNOWN - lcm_state == '36' || # BOOT_FAILURE + (lcm_state == '36' || # BOOT_FAILURE lcm_state == '37')) # BOOT_MIGRATE_FAILURE vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) - vm.boot + vm.recover(2) # 2 == retry new_nodes << node else diff --git a/src/oca/ruby/opennebula/oneflow_client.rb b/src/oca/ruby/opennebula/oneflow_client.rb index 9b7dee75f0..0547bc4221 100644 --- a/src/oca/ruby/opennebula/oneflow_client.rb +++ b/src/oca/ruby/opennebula/oneflow_client.rb @@ -31,7 +31,6 @@ module Role 'stop', 'suspend', 'resume', - 'boot', 'delete', 'delete-recreate', 'reboot', diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index dc19235f9f..0fd8d658c6 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -440,7 +440,6 @@ tabs: Role.suspend: true Role.resume: true Role.stop: true - Role.boot: true Role.reboot: true Role.reboot_hard: true Role.poweroff: true @@ -454,7 +453,6 @@ tabs: RoleVM.suspend: true RoleVM.resume: true RoleVM.stop: true - RoleVM.boot: true RoleVM.reboot: true RoleVM.reboot_hard: true RoleVM.poweroff: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 3b1e20ee37..414599c297 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -440,7 +440,6 @@ tabs: Role.suspend: true Role.resume: true Role.stop: true - Role.boot: true Role.reboot: true Role.reboot_hard: true Role.poweroff: true @@ -454,7 +453,6 @@ tabs: RoleVM.suspend: true RoleVM.resume: true RoleVM.stop: true - RoleVM.boot: true RoleVM.reboot: true RoleVM.reboot_hard: true RoleVM.poweroff: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index 3a08b92cd5..01a6456abf 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -441,7 +441,6 @@ tabs: Role.suspend: true Role.resume: true Role.stop: true - Role.boot: true Role.reboot: true Role.reboot_hard: true Role.poweroff: true @@ -455,7 +454,6 @@ tabs: RoleVM.suspend: true RoleVM.resume: true RoleVM.stop: true - RoleVM.boot: true RoleVM.reboot: true RoleVM.reboot_hard: true RoleVM.poweroff: true diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index 7603cf7814..bfcba78330 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -86,15 +86,6 @@ var role_actions = { notify: true }, - "Role.boot" : { - type: "multiple", - call: OpenNebula.Role.boot, - callback: roleCallback, - elements: roleElements, - error: onError, - notify: true - }, - "Role.reboot_hard" : { type: "multiple", call: OpenNebula.Role.reboot_hard, @@ -274,15 +265,6 @@ var role_actions = { notify: true }, - "RoleVM.boot" : { - type: "multiple", - call: OpenNebula.VM.restart, - callback: roleCallback, - elements: roleVMElements, - error: onError, - notify: true - }, - "RoleVM.reboot_hard" : { type: "multiple", call: OpenNebula.VM.reset, @@ -469,12 +451,6 @@ var role_buttons = { layout: "vmsstop_buttons", tip: tr("This will stop selected VMs") }, - "Role.boot" : { - type: "action", - text: tr("Boot"), - layout: "vmsplanification_buttons", - tip: tr("This will force the hypervisor boot action of VMs stuck in UNKNOWN or BOOT state") - }, "Role.reboot" : { type: "action", text: tr("Reboot"), @@ -569,12 +545,6 @@ var role_vm_buttons = { layout: "vmsstop_buttons", tip: tr("This will stop selected VMs") }, - "RoleVM.boot" : { - type: "action", - text: tr("Boot"), - layout: "vmsplanification_buttons", - tip: tr("This will force the hypervisor boot action of VMs stuck in UNKNOWN or BOOT state") - }, "RoleVM.reboot" : { type: "action", text: tr("Reboot"),