diff --git a/src/oca/ruby/OpenNebula.rb b/src/oca/ruby/OpenNebula.rb index 34360f0832..84336c191a 100644 --- a/src/oca/ruby/OpenNebula.rb +++ b/src/oca/ruby/OpenNebula.rb @@ -19,8 +19,6 @@ require 'OpenNebula/User' require 'OpenNebula/UserPool' require 'OpenNebula/Host' require 'OpenNebula/HostPool' -require 'OpenNebula/Cluster' -require 'OpenNebula/ClusterPool' module OpenNebula diff --git a/src/rm/RequestManagerDeploy.cc b/src/rm/RequestManagerDeploy.cc index 97b272a1d1..95b1c01cb1 100644 --- a/src/rm/RequestManagerDeploy.cc +++ b/src/rm/RequestManagerDeploy.cc @@ -148,8 +148,8 @@ error_vm_get: goto error_common; error_state: - oss.str(action_error(method_name, "MANAGE", "VM", vid, rc)); - oss << " Reason: VM in wrong state."; + oss << action_error(method_name, "MANAGE", "VM", vid, rc) + << ". Reason: VM in wrong state."; goto error_common_lock; error_authenticate: diff --git a/src/rm/RequestManagerMigrate.cc b/src/rm/RequestManagerMigrate.cc index 5658020871..cd03ab3e67 100644 --- a/src/rm/RequestManagerMigrate.cc +++ b/src/rm/RequestManagerMigrate.cc @@ -168,8 +168,8 @@ error_history: goto error_common_lock; error_state: - oss.str(action_error(method_name, "MANAGE", "VM", vid, rc)); - oss << " Reason: VM in wrong state."; + oss << action_error(method_name, "MANAGE", "VM", vid, rc) + << ". Reason: VM in wrong state."; goto error_common_lock; error_common_lock: diff --git a/src/rm/RequestManagerUserAllocate.cc b/src/rm/RequestManagerUserAllocate.cc index e31759295d..7fa13d4aad 100644 --- a/src/rm/RequestManagerUserAllocate.cc +++ b/src/rm/RequestManagerUserAllocate.cc @@ -113,17 +113,15 @@ error_authorize: goto error_common; error_duplicate: - oss.str(action_error(method_name, "CREATE", "USER", NULL, NULL)); - oss << " Reason: Existing user, cannot duplicate."; + oss << action_error(method_name, "CREATE", "USER", NULL, NULL) + << ". Reason: Existing user, cannot duplicate."; goto error_common; - error_allocate: oss.str(action_error(method_name, "CREATE", "USER", NULL, rc)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerUserDelete.cc b/src/rm/RequestManagerUserDelete.cc index c6817d2b00..f01c091548 100644 --- a/src/rm/RequestManagerUserDelete.cc +++ b/src/rm/RequestManagerUserDelete.cc @@ -105,8 +105,8 @@ void RequestManager::UserDelete::execute( return; error_oneadmin_deletion: - oss.str(action_error(method_name, "DELETE", "USER", uid, NULL)); - oss << " Reason: Oneadmin cannot be deleted."; + oss << action_error(method_name, "DELETE", "USER", uid, NULL) + << ". Reason: Oneadmin cannot be deleted."; goto error_common; error_authenticate: