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

Feature #1112, #962: Fix a bunch of typos in error messages

Browse Source
This commit is contained in:
Carlos Martín 2012-03-07 17:45:08 +01:00
parent 3a81160c93
commit e522dabcc1
29 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/one_helper/oneuser_helper.rb
View File

@ -34,7 +34,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
begin
password = File.read(arg).split("\n").first
rescue
return -1, "Can not read file: #{arg}"
return -1, "Cannot read file: #{arg}"
end
else
password = arg.dup

2
src/cloud/ec2/bin/econe-server
View File

@ -53,7 +53,7 @@ setup()
start()
{
if [ ! -f "$ECONE_SERVER" ]; then
echo "Can not find $ECONE_SERVER."
echo "Cannot find $ECONE_SERVER."
exit 1
fi

2
src/cloud/occi/bin/occi-server
View File

@ -53,7 +53,7 @@ setup()
start()
{
if [ ! -x "$OCCI_SERVER" ]; then
echo "Can not find $OCCI_SERVER."
echo "Cannot find $OCCI_SERVER."
exit 1
fi

4
src/cloud/occi/lib/OCCIClient.rb
View File

@ -131,7 +131,7 @@ module OCCIClient
file_path="/"+m[1]
end
elsif !image_info.elements['TYPE'] == "DATABLOCK"
return CloudClient::Error.new("Can not find URL")
return CloudClient::Error.new("Cannot find URL")
end
if curb
@ -316,7 +316,7 @@ module OCCIClient
end
if info.elements['ID'] == nil
return CloudClient::Error.new("Can not find RESOURCE ID")
return CloudClient::Error.new("Cannot find RESOURCE ID")
end
resource_id = info.elements['ID'].text

2
src/datastore_mad/remotes/libfs.sh
View File

@ -23,7 +23,7 @@
# @param $3 - Safe dirs
# @param $4 - Umask for new file creation (default: 0007)
# @return sets the following environment variables
# - RESTRICTED_DIRS: Paths that can not be used to register images
# - RESTRICTED_DIRS: Paths that cannot be used to register images
# - SAFE_DIRS: Paths that are safe to specify image paths
# - BASE_PATH: Path where the images will be stored
#------------------------------------------------------------------------------

4
src/dm/DispatchManagerActions.cc
View File

@ -664,7 +664,7 @@ int DispatchManager::resubmit(int vid)
{
case VirtualMachine::SUSPENDED:
NebulaLog::log("DiM",Log::ERROR,
"Can not resubmit a suspended VM. Resume it first");
"Cannot resubmit a suspended VM. Resume it first");
rc = -2;
break;
@ -688,7 +688,7 @@ int DispatchManager::resubmit(int vid)
break;
case VirtualMachine::DONE:
NebulaLog::log("DiM",Log::ERROR,
"Can not resubmit a VM already in DONE state");
"Cannot resubmit a VM already in DONE state");
rc = -2;
break;
}

2
src/group/GroupPool.cc
View File

@ -22,7 +22,7 @@
/* -------------------------------------------------------------------------- */
/* There are two default groups boostrapped by the core: */
/* - oneadmin can not be removed */
/* - oneadmin cannot be removed */
/* - users to place regular users by default */
/* The first 100 group IDs are reserved for system groups. Regular ones start */
/* from ID 100 */

2
src/host/test/HostPoolTest.cc
View File

@ -267,7 +267,7 @@ public:
CPPUNIT_ASSERT( oid_1 == -1 );
CPPUNIT_ASSERT( rc == oid_1 );
// the hostname can not be repeated if the drivers change
// the hostname cannot be repeated if the drivers change
rc = hp->allocate(&oid_1,
names[0],
im_mad_2,

12
src/image/ImageManagerActions.cc
View File

@ -95,7 +95,7 @@ int ImageManager::acquire_image(Image *img, string& error)
case Image::USED:
if (img->isPersistent())
{
error = "Cannot aquire persistent image, it is already in use";
error = "Cannot acquire persistent image, it is already in use";
rc = -1;
}
else
@ -106,15 +106,15 @@ int ImageManager::acquire_image(Image *img, string& error)
break;
case Image::DISABLED:
error = "Cannot aquire image, it is disabled";
error = "Cannot acquire image, it is disabled";
rc = -1;
break;
case Image::LOCKED:
error = "Cannot aquire image, it is locked";
error = "Cannot acquire image, it is locked";
rc = -1;
break;
case Image::ERROR:
error = "Cannot aquire image, it is in an error state";
error = "Cannot acquire image, it is in an error state";
rc = -1;
break;
default:
@ -276,13 +276,13 @@ int ImageManager::delete_image(int iid, const string& ds_data)
if ( img->get_running() != 0 )
{
img->unlock();
return -1; //Can not remove images in use
return -1; //Cannot remove images in use
}
break;
case Image::USED:
img->unlock();
return -1; //Can not remove images in use
return -1; //Cannot remove images in use
break;
case Image::INIT:

6
src/mad/Mad.cc
View File

@ -239,13 +239,13 @@ int Mad::start()
error_exec:
oss.str("");
oss << "Can not load driver " << executable << ", " << strerror(errno);
oss << "Cannot load driver " << executable << ", " << strerror(errno);
NebulaLog::log("MAD", Log::ERROR, oss);
exit(-1);
error_dup2:
oss.str("");
oss << "Can not duplicate descriptors, " << strerror(errno);
oss << "Cannot duplicate descriptors, " << strerror(errno);
NebulaLog::log("MAD", Log::ERROR, oss);
exit(-1);
@ -275,7 +275,7 @@ error_attributes:
error_pipes:
oss.str("");
oss << "Can not create driver pipes, " << strerror(errno);
oss << "Cannot create driver pipes, " << strerror(errno);
NebulaLog::log("MAD", Log::ERROR, oss);
return -1;
}

4
src/nebula/oned.cc
View File

@ -127,7 +127,7 @@ int main(int argc, char **argv)
if( fd == -1)
{
cerr<< "Error: Can not start oned, opening lock file " << lockfile
cerr<< "Error: Cannot start oned, opening lock file " << lockfile
<< endl;
exit(-1);
@ -186,7 +186,7 @@ int main(int argc, char **argv)
return 0;
error_chdir:
cerr << "Error: can not change to dir " << wd << "\n";
cerr << "Error: cannot change to dir " << wd << "\n";
unlink(lockfile.c_str());
exit(-1);

2
src/oca/java/test/oned.conf
View File

@ -6,7 +6,7 @@
# Daemon configuration attributes
#-------------------------------------------------------------------------------
# MANAGER_TIMER: Time in seconds the core uses to evaluate periodical functions.
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL can not have smaller values
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL cannot have smaller values
# than MANAGER_TIMER.
#
# HOST_MONITORING_INTERVAL: Time in seconds between host monitorization.

2
src/oca/ruby/OpenNebula/Group.rb
View File

@ -69,7 +69,7 @@ module OpenNebula
# Creates ACLs for the group. The ACL rules are described in a file
def create_acls(filename = GROUP_DEFAULT)
if !File.readable?(filename)
return -1, "Can not read deafult ACL file for group"
return -1, "Cannot read deafult ACL file for group"
end
msg = String.new

4
src/onedb/test/oned_mysql.conf
View File

@ -6,7 +6,7 @@
# Daemon configuration attributes
#-------------------------------------------------------------------------------
# MANAGER_TIMER: Time in seconds the core uses to evaluate periodical functions.
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL can not have smaller values
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL cannot have smaller values
# than MANAGER_TIMER.
#
# HOST_MONITORING_INTERVAL: Time in seconds between host monitorization.
@ -390,7 +390,7 @@ HM_MAD = [
#-------------------------------- ebtables Hook---------------------------------
# You can use these two hooks to isolate networks at the ethernet level so the
# traffic generated in different virtual networks can not be seen in others.
# traffic generated in different virtual networks cannot be seen in others.
#
# All the network configuration will be done in the cluster nodes, these are the
# additional requisites:

4
src/onedb/test/oned_sqlite.conf
View File

@ -6,7 +6,7 @@
# Daemon configuration attributes
#-------------------------------------------------------------------------------
# MANAGER_TIMER: Time in seconds the core uses to evaluate periodical functions.
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL can not have smaller values
# HOST_MONITORING_INTERVAL and VM_POLLING_INTERVAL cannot have smaller values
# than MANAGER_TIMER.
#
# HOST_MONITORING_INTERVAL: Time in seconds between host monitorization.
@ -390,7 +390,7 @@ HM_MAD = [
#-------------------------------- ebtables Hook---------------------------------
# You can use these two hooks to isolate networks at the ethernet level so the
# traffic generated in different virtual networks can not be seen in others.
# traffic generated in different virtual networks cannot be seen in others.
#
# All the network configuration will be done in the cluster nodes, these are the
# additional requisites:

2
src/ozones/Server/bin/ozones-server
View File

@ -54,7 +54,7 @@ setup()
start()
{
if [ ! -f "$OZONES_SERVER" ]; then
echo "Can not find $OZONES_SERVER."
echo "Cannot find $OZONES_SERVER."
exit 1
fi

4
src/ozones/Server/models/OzonesServer.rb
View File

@ -217,7 +217,7 @@ class OzonesServer < CloudServer
vdc = OZones::OpenNebulaVdc.new(id)
rc = vdc.destroy
rescue => e
return [404, OZones::Error.new("Error: Can not delete vdc. " \
return [404, OZones::Error.new("Error: Cannot delete vdc. " \
"Reason: #{e.message}").to_json]
end
@ -237,7 +237,7 @@ class OzonesServer < CloudServer
rc = zone.destroy
else
return [404,
OZones::Error.new("Error: Can not delete " \
OZones::Error.new("Error: Cannot delete " \
"zone. Reason: zone #{id} not found").to_json]
end

2
src/pool/PoolObjectSQL.cc
View File

@ -172,7 +172,7 @@ int PoolObjectSQL::replace_template(const string& tmpl_str, string& error)
if ( new_tmpl == 0 )
{
error = "Can not allocate a new template";
error = "Cannot allocate a new template";
return -1;
}

6
src/rm/RequestManager.cc
View File

@ -114,7 +114,7 @@ int RequestManager::setup_socket()
{
ostringstream oss;
oss << "Can not open server socket: " << strerror(errno);
oss << "Cannot open server socket: " << strerror(errno);
NebulaLog::log("ReM",Log::ERROR,oss);
return -1;
@ -126,7 +126,7 @@ int RequestManager::setup_socket()
{
ostringstream oss;
oss << "Can not set socket options: " << strerror(errno);
oss << "Cannot set socket options: " << strerror(errno);
NebulaLog::log("ReM",Log::ERROR,oss);
close(socket_fd);
@ -146,7 +146,7 @@ int RequestManager::setup_socket()
{
ostringstream oss;
oss << "Can not bind to port " << port << " : " << strerror(errno);
oss << "Cannot bind to port " << port << " : " << strerror(errno);
NebulaLog::log("ReM",Log::ERROR,oss);
close(socket_fd);

6
src/rm/RequestManagerDelete.cc
View File

@ -91,7 +91,7 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList,
if ( rc != 0 )
{
failure_response(INTERNAL,
request_error("Can not delete "+object_name(auth_object),error_msg),
request_error("Cannot delete "+object_name(auth_object),error_msg),
att);
return;
}
@ -163,7 +163,7 @@ int ImageDelete::drop(int oid, PoolObjectSQL * object, string& error_msg)
if ( ds == 0 )
{
error_msg = "Datastore no longer exists can not remove image";
error_msg = "Datastore no longer exists cannot remove image";
return -1;
}
@ -199,7 +199,7 @@ int UserDelete::drop(int oid, PoolObjectSQL * object, string& error_msg)
if (oid == 0)
{
error_msg = "oneadmin can not be deleted.";
error_msg = "oneadmin cannot be deleted.";
object->unlock();
return -1;

2
src/rm/RequestManagerUpdateTemplate.cc
View File

@ -54,7 +54,7 @@ void RequestManagerUpdateTemplate::request_execute(
if ( rc != 0 )
{
failure_response(INTERNAL,
request_error("Can not update template",error_str),
request_error("Cannot update template",error_str),
att);
object->unlock();

4
src/rm/RequestManagerVirtualMachine.cc
View File

@ -160,7 +160,7 @@ int RequestManagerVirtualMachine::add_history(VirtualMachine * vm,
if ( rc != 0 )
{
failure_response(INTERNAL,
request_error("Can not update virtual machine history",""),
request_error("Cannot update virtual machine history",""),
att);
return -1;
@ -442,7 +442,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis
if ( iid_orig == -1 )
{
failure_response(INTERNAL,
request_error("Can not used selected DISK", error_str),
request_error("Cannot use selected DISK", error_str),
att);
return;
}

2
src/sunstone/bin/sunstone-server
View File

@ -53,7 +53,7 @@ setup()
start()
{
if [ ! -f "$SUNSTONE_SERVER" ]; then
echo "Can not find $SUNSTONE_SERVER."
echo "Cannot find $SUNSTONE_SERVER."
exit 1
fi

2
src/tm_mad/vmware/functions.sh
View File

@ -24,7 +24,7 @@ function fix_iso {
if [ $? -eq 0 ]; then
bname=`basename $dst_path`
exec_and_log "ln -s $bname $dst_path/$bname.iso" \
"Can not link ISO file."
"Cannot link ISO file."
fi
fi
}

10
src/vm/VirtualMachine.cc
View File

@ -183,7 +183,7 @@ int VirtualMachine::select(SqlDB * db)
return 0;
error_previous_history:
ose << "Can not get previous history record (seq:" << history->seq
ose << "Cannot get previous history record (seq:" << history->seq
<< ") for VM id: " << oid;
log("ONE", Log::ERROR, ose);
@ -380,7 +380,7 @@ int VirtualMachine::parse_context(string& error_str)
if (str == 0)
{
NebulaLog::log("ONE",Log::ERROR, "Can not marshall CONTEXT");
NebulaLog::log("ONE",Log::ERROR, "Cannot marshall CONTEXT");
return -1;
}
@ -955,15 +955,15 @@ int VirtualMachine::get_disk_images(string& error_str)
return 0;
error_max_os:
error_str = "VM can not use more than one OS image.";
error_str = "VM cannot use more than one OS image.";
goto error_common;
error_max_cd:
error_str = "VM can not use more than one CDROM image.";
error_str = "VM cannot use more than one CDROM image.";
goto error_common;
error_max_db:
error_str = "VM can not use more than 10 DATABLOCK images.";
error_str = "VM cannot use more than 10 DATABLOCK images.";
goto error_common;
error_common:

2
src/vm/VirtualMachinePool.cc
View File

@ -170,7 +170,7 @@ VirtualMachinePool::VirtualMachinePool(SqlDB * db,
{
ostringstream oss;
oss << "Unkown VM_HOOK " << on << ". Hook not registered!";
oss << "Unknown VM_HOOK " << on << ". Hook not registered!";
NebulaLog::log("VM",Log::WARNING,oss);
}
}

6
src/vmm_mad/ec2/one_vmm_ec2.rb
View File

@ -185,7 +185,7 @@ class EC2Driver < VirtualMachineDriver
return unless ec2_info
if !ec2_value(ec2_info, 'AMI')
msg = "Can not find AMI in deployment file"
msg = "Cannot find AMI in deployment file"
send_message(ACTION[:deploy], RESULT[:failure], id, msg)
return
end
@ -294,7 +294,7 @@ private
if !local_dfile
send_message(ACTION[:deploy],RESULT[:failure],id,
"Can not open deployment file #{local_dfile}")
"Cannot open deployment file #{local_dfile}")
return
end
@ -322,7 +322,7 @@ private
ec2 = all_ec2_elements[0]
else
send_message(ACTION[:deploy],RESULT[:failure],id,
"Can not find EC2 element in deployment file "<<
"Cannot find EC2 element in deployment file "<<
"#{local_dfile} or couldn't find any EC2 site matching "<<
"one of the template.")
return

2
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -259,7 +259,7 @@ class ExecDriver < VirtualMachineDriver
if !local_dfile || File.zero?(local_dfile)
send_message(ACTION[:deploy],RESULT[:failure],id,
"Can not open deployment file #{local_dfile}")
"Cannot open deployment file #{local_dfile}")
return
end

2
src/vmm_mad/remotes/vmware/vmware_driver.rb
View File

@ -167,7 +167,7 @@ class VMwareDriver
# Define the VM
dfile = File.dirname(File.dirname(checkpoint)) + "/deployment.0"
rescue => e
OpenNebula.log_error("Can not open checkpoint #{e.message}")
OpenNebula.log_error("Cannot open checkpoint #{e.message}")
exit -1
end