mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
(cherry picked from commit 3a9d720ad2340a3fd73d362e293ac39c0743d3a1)
This commit is contained in:
1 parent
763c733a91
commit
7f45e18117
3 files changed
+8
-4
No files matched your search
@@ -39,7 +39,9 @@ int DispatchManager::deploy (
|
||||
NebulaLog::log("DiM",Log::DEBUG,oss);
|
||||
|
||||
if ( vm->get_state() == VirtualMachine::PENDING ||
|
||||
vm->get_state() == VirtualMachine::HOLD )
|
||||
vm->get_state() == VirtualMachine::HOLD ||
|
||||
vm->get_state() == VirtualMachine::STOPPED ||
|
||||
vm->get_state() == VirtualMachine::UNDEPLOYED )
|
||||
{
|
||||
Nebula& nd = Nebula::instance();
|
||||
LifeCycleManager * lcm = nd.get_lcm();
|
||||
|
||||
@@ -770,7 +770,9 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
|
||||
}
|
||||
|
||||
if (vm->get_state() != VirtualMachine::PENDING &&
|
||||
vm->get_state() != VirtualMachine::HOLD)
|
||||
vm->get_state() != VirtualMachine::HOLD &&
|
||||
vm->get_state() != VirtualMachine::STOPPED &&
|
||||
vm->get_state() != VirtualMachine::UNDEPLOYED)
|
||||
{
|
||||
failure_response(ACTION,
|
||||
request_error("Wrong state to perform action",""),
|
||||
|
||||
@@ -60,7 +60,7 @@ var state_actions = {
|
||||
["VM.delete", "VM.delete_recreate", "VM.recover"],
|
||||
|
||||
4: //OpenNebula.VM.state.STOPPED:
|
||||
["VM.delete", "VM.delete_recreate", "VM.resume"],
|
||||
["VM.delete", "VM.delete_recreate", "VM.resume", "VM.deploy"],
|
||||
|
||||
5: //OpenNebula.VM.state.SUSPENDED:
|
||||
["VM.delete", "VM.resume"],
|
||||
@@ -75,7 +75,7 @@ var state_actions = {
|
||||
["VM.delete", "VM.resume", "VM.resize", "VM.attachdisk", "VM.detachdisk", "VM.attachnic", "VM.detachnic"],
|
||||
|
||||
9: //OpenNebula.VM.state.UNDEPLOYED:
|
||||
["VM.delete", "VM.delete_recreate", "VM.resume", "VM.resize"],
|
||||
["VM.delete", "VM.delete_recreate", "VM.resume", "VM.resize", "VM.deploy"],
|
||||
}
|
||||
|
||||
var lcm_state_actions = {
|
||||
|
||||
Reference in new issue
Block a user