Revision c322e7c3

View differences:

src/oca/ruby/OpenNebula.rb
19 19
require 'OpenNebula/UserPool'
20 20
require 'OpenNebula/Host'
21 21
require 'OpenNebula/HostPool'
22
require 'OpenNebula/Cluster'
23
require 'OpenNebula/ClusterPool'
24 22

  
25 23
module OpenNebula
26 24

  
src/rm/RequestManagerDeploy.cc
148 148
    goto error_common;
149 149

  
150 150
error_state:
151
    oss.str(action_error(method_name, "MANAGE", "VM", vid, rc));
152
    oss << " Reason: VM in wrong state.";
151
    oss << action_error(method_name, "MANAGE", "VM", vid, rc) 
152
        << ". Reason: VM in wrong state.";
153 153
    goto error_common_lock;
154 154

  
155 155
error_authenticate:
src/rm/RequestManagerMigrate.cc
168 168
    goto error_common_lock;
169 169

  
170 170
error_state:
171
    oss.str(action_error(method_name, "MANAGE", "VM", vid, rc));
172
    oss << " Reason: VM in wrong state.";
171
    oss << action_error(method_name, "MANAGE", "VM", vid, rc) 
172
        << ". Reason: VM in wrong state.";
173 173
    goto error_common_lock;
174 174

  
175 175
error_common_lock:
src/rm/RequestManagerUserAllocate.cc
113 113
    goto error_common;  
114 114
     
115 115
error_duplicate:
116
    oss.str(action_error(method_name, "CREATE", "USER", NULL, NULL));
117
    oss << " Reason: Existing user, cannot duplicate.";
116
    oss << action_error(method_name, "CREATE", "USER", NULL, NULL)
117
        << ". Reason: Existing user, cannot duplicate.";
118 118
    goto error_common;
119 119

  
120

  
121 120
error_allocate:
122 121
    oss.str(action_error(method_name, "CREATE", "USER", NULL, rc));
123 122
    goto error_common;
124 123

  
125 124
error_common:
126

  
127 125
    arrayData.push_back(xmlrpc_c::value_boolean(false));  // FAILURE
128 126
    arrayData.push_back(xmlrpc_c::value_string(oss.str()));
129 127
    
src/rm/RequestManagerUserDelete.cc
105 105
    return;
106 106

  
107 107
error_oneadmin_deletion:
108
    oss.str(action_error(method_name, "DELETE", "USER", uid, NULL));
109
    oss << " Reason: Oneadmin cannot be deleted.";
108
    oss << action_error(method_name, "DELETE", "USER", uid, NULL) 
109
        << ". Reason: Oneadmin cannot be deleted.";
110 110
    goto error_common;
111 111

  
112 112
error_authenticate:

Also available in: Unified diff