shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #3932, #3801: Rename VM shutdown & delete in scheduled actions

Browse Source
This commit is contained in:
Carlos Martín 2016-05-06 12:59:25 +02:00
parent 60b03bd2fd
commit 64bd2b1093
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scheduler/include/VirtualMachinePoolXML.h
View File

@ -129,7 +129,7 @@ public:
* Calls one.vm.action
*
* @param vid The VM id
* @param action Action argument (shutdown, hold, release...)
* @param action Action argument (terminate, hold, release...)
* @param error_msg Error reason, if any
*
* @return 0 on success, -1 otherwise

13
src/scheduler/src/pool/VirtualMachineXML.cc
View File

@ -374,8 +374,8 @@ int VirtualMachineXML::parse_action_name(string& action_st)
{
one_util::tolower(action_st);
if ( action_st != "shutdown"
&& action_st != "shutdown-hard"
if ( action_st != "terminate"
&& action_st != "terminate-hard"
&& action_st != "undeploy"
&& action_st != "undeploy-hard"
&& action_st != "hold"
@ -383,13 +383,16 @@ int VirtualMachineXML::parse_action_name(string& action_st)
&& action_st != "stop"
&& action_st != "suspend"
&& action_st != "resume"
&& action_st != "delete"
&& action_st != "delete-recreate"
&& action_st != "reboot"
&& action_st != "reboot-hard"
&& action_st != "poweroff"
&& action_st != "poweroff-hard"
&& action_st != "snapshot-create")
&& action_st != "snapshot-create"
// Compatibility with 4.x
&& action_st != "shutdown"
&& action_st != "shutdown-hard"
&& action_st != "delete")
{
return -1;
}

6
src/sunstone/public/app/tabs/vms-tab/panels/actions.js
View File

@ -90,15 +90,13 @@ define(function(require) {
<td></td>\
<td>\
<select id="select_new_action" class="select_new_action" name="select_action">\
<option value="shutdown">' + Locale.tr("shutdown") + '</option>\
<option value="shutdown-hard">' + Locale.tr("shutdown-hard") + '</option>\
<option value="terminate">' + Locale.tr("terminate") + '</option>\
<option value="terminate-hard">' + Locale.tr("terminate-hard") + '</option>\
<option value="hold">' + Locale.tr("hold") + '</option>\
<option value="release">' + Locale.tr("release") + '</option>\
<option value="stop">' + Locale.tr("stop") + '</option>\
<option value="suspend">' + Locale.tr("suspend") + '</option>\
<option value="resume">' + Locale.tr("resume") + '</option>\
<option value="delete">' + Locale.tr("delete") + '</option>\
<option value="delete-recreate">' + Locale.tr("delete-recreate") + '</option>\
<option value="reboot">' + Locale.tr("reboot") + '</option>\
<option value="reboot-hard">' + Locale.tr("reboot-hard") + '</option>\
<option value="poweroff">' + Locale.tr("poweroff") + '</option>\