shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

Merge branch 'feature-203' of dsa-research.org:one into feature-203

Browse Source
This commit is contained in:
Ruben S. Montero 2010-07-14 18:11:54 +02:00
commit 235186a998
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/RequestManager.h
View File

@ -237,16 +237,19 @@ private:
oss << "[" << method << "]" << " Error trying to " << action << " "
<< object;
if ( id != -1 )
switch(id)
{
oss << " [" << id << "].";
case -2:
break;
case -1:
oss << "Pool.";
break;
default:
oss << " [" << id << "].";
break;
}
else
{
oss << " Pool.";
}
if ( rc != (int)NULL )
{
oss << " Returned error code [" << rc << "].";

2
src/rm/RequestManagerAllocate.cc
View File

@ -170,7 +170,7 @@ error_parse:
goto error_common;
error_allocate:
oss.str(action_error(method_name, "CREATE", "VM", -1, rc));
oss.str(action_error(method_name, "CREATE", "VM", -2, rc));
goto error_common;
error_common:

2
src/rm/RequestManagerClusterAllocate.cc
View File

@ -95,7 +95,7 @@ error_authorize:
goto error_common;
error_cluster_allocate:
oss.str(action_error(method_name, "CREATE", "CLUSTER", -1, rc));
oss.str(action_error(method_name, "CREATE", "CLUSTER", -2, rc));
goto error_common;
error_common:

2
src/rm/RequestManagerHostAllocate.cc
View File

@ -105,7 +105,7 @@ error_authorize:
goto error_common;
error_host_allocate:
oss.str(action_error(method_name, "CREATE", "HOST", -1, rc));
oss.str(action_error(method_name, "CREATE", "HOST", -2, rc));
goto error_common;
error_common:

2
src/rm/RequestManagerUserAllocate.cc
View File

@ -118,7 +118,7 @@ error_duplicate:
goto error_common;
error_allocate:
oss.str(action_error(method_name, "CREATE", "USER", -1, rc));
oss.str(action_error(method_name, "CREATE", "USER", -2, rc));
goto error_common;
error_common:

2
src/rm/RequestManagerVirtualNetworkAllocate.cc
View File

@ -97,7 +97,7 @@ error_get_user:
goto error_common;
error_vn_allocate:
oss.str(action_error(method_name, "ALLOCATE", "NET", -1, rc));
oss.str(action_error(method_name, "CREATE", "NET", -2, rc));
goto error_common;
error_common: