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

Changes in error messages

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@684 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-07-14 11:46:27 +00:00
parent 93c88292bc
commit 2b862d852c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rm/RequestManagerMigrate.cc
View File

@ -89,9 +89,9 @@ void RequestManager::VirtualMachineMigrate::execute(
// Only oneadmin or the VM owner can perform operations upon the VM
rc = VirtualMachineMigrate::upool->authenticate(session);
if ( rc != 0 && rc != uid)
{
goto error_authenticate;
if ( rc != 0 && rc != uid)
{
goto error_authenticate;
}
if ((vm->get_state() != VirtualMachine::ACTIVE) ||
@ -117,7 +117,7 @@ void RequestManager::VirtualMachineMigrate::execute(
}
else
{
dm->migrate(vm);
dm->migrate(vm);
}
vm->unlock();
@ -150,13 +150,13 @@ error_vm_get:
error_history:
vm->unlock();
oss << "Can not deploy VM " << vid << ", can not insert history";
oss << "Can not migrate VM " << vid << ", can not insert history";
goto error_common;
error_state:
vm->unlock();
oss << "Can not deploy VM " << vid << ", wrong state";
oss << "Can not migrate VM " << vid << ", wrong state";
goto error_common;
error_common:

8
src/rm/RequestManagerUserDelete.cc
View File

@ -52,9 +52,9 @@ void RequestManager::UserDelete::execute(
// Only oneadmin can delete users
rc = UserDelete::upool->authenticate(session);
if ( rc != 0 )
{
goto error_authenticate;
if ( rc != 0 )
{
goto error_authenticate;
}
// Now let's get the user
@ -90,7 +90,7 @@ error_oneadmin_deletion:
goto error_common;
error_authenticate:
oss << "User not authorized to add new users";
oss << "User not authorized to delete users";
goto error_common;
error_get_user: