summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
Diffstat (limited to 'nova')
-rw-r--r--nova/api/ec2/cloud.py2
-rw-r--r--nova/auth/dbdriver.py4
-rw-r--r--nova/auth/ldapdriver.py43
-rw-r--r--nova/console/manager.py2
-rw-r--r--nova/console/xvp.py14
-rw-r--r--nova/network/manager.py2
-rw-r--r--nova/objectstore/handler.py6
-rw-r--r--nova/objectstore/image.py13
-rw-r--r--nova/rpc.py2
-rw-r--r--nova/scheduler/simple.py4
-rw-r--r--nova/twistd.py4
-rw-r--r--nova/virt/libvirt_conn.py3
-rw-r--r--nova/wsgi.py2
13 files changed, 54 insertions, 47 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c94540793..f0aa8d813 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -59,7 +59,7 @@ def _gen_key(context, user_id, key_name):
# creation before creating key_pair
try:
db.key_pair_get(context, user_id, key_name)
- raise exception.Duplicate("The key_pair %s already exists"
+ raise exception.Duplicate(_("The key_pair %s already exists")
% key_name)
except exception.NotFound:
pass
diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py
index 0eb6fe588..d8dad8edd 100644
--- a/nova/auth/dbdriver.py
+++ b/nova/auth/dbdriver.py
@@ -119,8 +119,8 @@ class DbDriver(object):
for member_uid in member_uids:
member = db.user_get(context.get_admin_context(), member_uid)
if not member:
- raise exception.NotFound("Project can't be created "
- "because user %s doesn't exist"
+ raise exception.NotFound(_("Project can't be created "
+ "because user %s doesn't exist")
% member_uid)
members.add(member)
diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py
index bc53e0ec6..a6915ce03 100644
--- a/nova/auth/ldapdriver.py
+++ b/nova/auth/ldapdriver.py
@@ -146,7 +146,7 @@ class LdapDriver(object):
def create_user(self, name, access_key, secret_key, is_admin):
"""Create a user"""
if self.__user_exists(name):
- raise exception.Duplicate("LDAP user %s already exists" % name)
+ raise exception.Duplicate(_("LDAP user %s already exists") % name)
if FLAGS.ldap_user_modify_only:
if self.__ldap_user_exists(name):
# Retrieve user by name
@@ -310,7 +310,7 @@ class LdapDriver(object):
def delete_user(self, uid):
"""Delete a user"""
if not self.__user_exists(uid):
- raise exception.NotFound("User %s doesn't exist" % uid)
+ raise exception.NotFound(_("User %s doesn't exist") % uid)
self.__remove_from_all(uid)
if FLAGS.ldap_user_modify_only:
# Delete attributes
@@ -432,15 +432,15 @@ class LdapDriver(object):
description, member_uids=None):
"""Create a group"""
if self.__group_exists(group_dn):
- raise exception.Duplicate("Group can't be created because "
- "group %s already exists" % name)
+ raise exception.Duplicate(_("Group can't be created because "
+ "group %s already exists") % name)
members = []
if member_uids is not None:
for member_uid in member_uids:
if not self.__user_exists(member_uid):
- raise exception.NotFound("Group can't be created "
- "because user %s doesn't exist" %
- member_uid)
+ raise exception.NotFound(_("Group can't be created "
+ "because user %s doesn't exist")
+ % member_uid)
members.append(self.__uid_to_dn(member_uid))
dn = self.__uid_to_dn(uid)
if not dn in members:
@@ -455,8 +455,8 @@ class LdapDriver(object):
def __is_in_group(self, uid, group_dn):
"""Check if user is in group"""
if not self.__user_exists(uid):
- raise exception.NotFound("User %s can't be searched in group "
- "because the user doesn't exist" % uid)
+ raise exception.NotFound(_("User %s can't be searched in group "
+ "because the user doesn't exist") % uid)
if not self.__group_exists(group_dn):
return False
res = self.__find_object(group_dn,
@@ -467,10 +467,10 @@ class LdapDriver(object):
def __add_to_group(self, uid, group_dn):
"""Add user to group"""
if not self.__user_exists(uid):
- raise exception.NotFound("User %s can't be added to the group "
- "because the user doesn't exist" % uid)
+ raise exception.NotFound(_("User %s can't be added to the group "
+ "because the user doesn't exist") % uid)
if not self.__group_exists(group_dn):
- raise exception.NotFound("The group at dn %s doesn't exist" %
+ raise exception.NotFound(_("The group at dn %s doesn't exist") %
group_dn)
if self.__is_in_group(uid, group_dn):
raise exception.Duplicate(_("User %s is already a member of "
@@ -481,15 +481,15 @@ class LdapDriver(object):
def __remove_from_group(self, uid, group_dn):
"""Remove user from group"""
if not self.__group_exists(group_dn):
- raise exception.NotFound("The group at dn %s doesn't exist" %
- group_dn)
+ raise exception.NotFound(_("The group at dn %s doesn't exist")
+ % group_dn)
if not self.__user_exists(uid):
- raise exception.NotFound("User %s can't be removed from the "
- "group because the user doesn't exist" %
- uid)
+ raise exception.NotFound(_("User %s can't be removed from the "
+ "group because the user doesn't exist")
+ % uid)
if not self.__is_in_group(uid, group_dn):
- raise exception.NotFound("User %s is not a member of the group" %
- uid)
+ raise exception.NotFound(_("User %s is not a member of the group")
+ % uid)
# NOTE(vish): remove user from group and any sub_groups
sub_dns = self.__find_group_dns_with_member(group_dn, uid)
for sub_dn in sub_dns:
@@ -509,8 +509,9 @@ class LdapDriver(object):
def __remove_from_all(self, uid):
"""Remove user from all roles and projects"""
if not self.__user_exists(uid):
- raise exception.NotFound("User %s can't be removed from all "
- "because the user doesn't exist" % uid)
+ raise exception.NotFound(_("User %s can't be removed from all "
+ "because the user doesn't exist")
+ % uid)
role_dns = self.__find_group_dns_with_member(
FLAGS.role_project_subtree, uid)
for role_dn in role_dns:
diff --git a/nova/console/manager.py b/nova/console/manager.py
index c55ca8e8f..5697e7cb1 100644
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@@ -67,7 +67,7 @@ class ConsoleProxyManager(manager.Manager):
pool['id'],
instance_id)
except exception.NotFound:
- logging.debug("Adding console")
+ logging.debug(_("Adding console"))
if not password:
password = self.driver.generate_password()
if not port:
diff --git a/nova/console/xvp.py b/nova/console/xvp.py
index 2a76223da..ee66dac46 100644
--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@@ -96,7 +96,7 @@ class XVPConsoleProxy(object):
return os.urandom(length * 2).encode('base64')[:length]
def _rebuild_xvp_conf(self, context):
- logging.debug("Rebuilding xvp conf")
+ logging.debug(_("Rebuilding xvp conf"))
pools = [pool for pool in
db.console_pool_get_all_by_host_type(context, self.host,
self.console_type)
@@ -113,12 +113,12 @@ class XVPConsoleProxy(object):
self._xvp_restart()
def _write_conf(self, config):
- logging.debug('Re-wrote %s' % FLAGS.console_xvp_conf)
+ logging.debug(_('Re-wrote %s') % FLAGS.console_xvp_conf)
with open(FLAGS.console_xvp_conf, 'w') as cfile:
cfile.write(config)
def _xvp_stop(self):
- logging.debug("Stopping xvp")
+ logging.debug(_("Stopping xvp"))
pid = self._xvp_pid()
if not pid:
return
@@ -131,19 +131,19 @@ class XVPConsoleProxy(object):
def _xvp_start(self):
if self._xvp_check_running():
return
- logging.debug("Starting xvp")
+ logging.debug(_("Starting xvp"))
try:
utils.execute('xvp -p %s -c %s -l %s' %
(FLAGS.console_xvp_pid,
FLAGS.console_xvp_conf,
FLAGS.console_xvp_log))
except exception.ProcessExecutionError, err:
- logging.error("Error starting xvp: %s" % err)
+ logging.error(_("Error starting xvp: %s") % err)
def _xvp_restart(self):
- logging.debug("Restarting xvp")
+ logging.debug(_("Restarting xvp"))
if not self._xvp_check_running():
- logging.debug("xvp not running...")
+ logging.debug(_("xvp not running..."))
self._xvp_start()
else:
pid = self._xvp_pid()
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 61de8055a..5d7589090 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -211,7 +211,7 @@ class NetworkManager(manager.Manager):
def release_fixed_ip(self, context, mac, address):
"""Called by dhcp-bridge when ip is released."""
- LOG.debug("Releasing IP %s", address, context=context)
+ LOG.debug(_("Releasing IP %s"), address, context=context)
fixed_ip_ref = self.db.fixed_ip_get_by_address(context, address)
instance_ref = fixed_ip_ref['instance']
if not instance_ref:
diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py
index bc26fd3c5..43ed7ffe7 100644
--- a/nova/objectstore/handler.py
+++ b/nova/objectstore/handler.py
@@ -315,8 +315,10 @@ class ObjectResource(ErrorHandlingResource):
context=request.context)
if not self.bucket.is_authorized(request.context):
- LOG.audit("Unauthorized attempt to delete object %s from "
- "bucket %s", self.name, self.bucket.name,
+ LOG.audit(_("Unauthorized attempt to delete object "
+ "%(object)s from bucket %(bucket)s") %
+ {'object': self.name,
+ 'bucket': self.bucket.name},
context=request.context)
raise exception.NotAuthorized()
diff --git a/nova/objectstore/image.py b/nova/objectstore/image.py
index abc28182e..41e0abd80 100644
--- a/nova/objectstore/image.py
+++ b/nova/objectstore/image.py
@@ -259,22 +259,25 @@ class Image(object):
process_input=encrypted_key,
check_exit_code=False)
if err:
- raise exception.Error("Failed to decrypt private key: %s" % err)
+ raise exception.Error(_("Failed to decrypt private key: %s")
+ % err)
iv, err = utils.execute(
'openssl rsautl -decrypt -inkey %s' % cloud_private_key,
process_input=encrypted_iv,
check_exit_code=False)
if err:
- raise exception.Error("Failed to decrypt initialization "
- "vector: %s" % err)
+ raise exception.Error(_("Failed to decrypt initialization "
+ "vector: %s") % err)
_out, err = utils.execute(
'openssl enc -d -aes-128-cbc -in %s -K %s -iv %s -out %s'
% (encrypted_filename, key, iv, decrypted_filename),
check_exit_code=False)
if err:
- raise exception.Error("Failed to decrypt image file %s : %s" %
- (encrypted_filename, err))
+ raise exception.Error(_("Failed to decrypt image file "
+ "%(image_file)s: %(err)s") %
+ {'image_file': encrypted_filename,
+ 'err': err})
@staticmethod
def untarzip_image(path, filename):
diff --git a/nova/rpc.py b/nova/rpc.py
index 49b11602b..bbfa71138 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -343,7 +343,7 @@ def call(context, topic, msg):
def cast(context, topic, msg):
"""Sends a message on a topic without waiting for a response"""
- LOG.debug("Making asynchronous cast...")
+ LOG.debug(_("Making asynchronous cast..."))
_pack_context(msg, context)
conn = Connection.instance()
publisher = TopicPublisher(connection=conn, topic=topic)
diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py
index 47baf0d73..baf4966d4 100644
--- a/nova/scheduler/simple.py
+++ b/nova/scheduler/simple.py
@@ -48,7 +48,7 @@ class SimpleScheduler(chance.ChanceScheduler):
service = db.service_get_by_args(context.elevated(), host,
'nova-compute')
if not self.service_is_up(service):
- raise driver.WillNotSchedule("Host %s is not alive" % host)
+ raise driver.WillNotSchedule(_("Host %s is not alive") % host)
# TODO(vish): this probably belongs in the manager, if we
# can generalize this somehow
@@ -80,7 +80,7 @@ class SimpleScheduler(chance.ChanceScheduler):
service = db.service_get_by_args(context.elevated(), host,
'nova-volume')
if not self.service_is_up(service):
- raise driver.WillNotSchedule("Host %s not available" % host)
+ raise driver.WillNotSchedule(_("Host %s not available") % host)
# TODO(vish): this probably belongs in the manager, if we
# can generalize this somehow
diff --git a/nova/twistd.py b/nova/twistd.py
index 556271999..6390a8144 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -156,7 +156,7 @@ def WrapTwistedOptions(wrapped):
try:
self.parseArgs(*argv)
except TypeError:
- raise usage.UsageError("Wrong number of arguments.")
+ raise usage.UsageError(_("Wrong number of arguments."))
self.postOptions()
return args
@@ -220,7 +220,7 @@ def stop(pidfile):
time.sleep(0.1)
except OSError, err:
err = str(err)
- if err.find("No such process") > 0:
+ if err.find(_("No such process")) > 0:
if os.path.exists(pidfile):
os.remove(pidfile)
else:
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index e70abb4e5..7005ae814 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -732,7 +732,8 @@ class LibvirtConnection(object):
'cpu_time': cpu_time}
def get_diagnostics(self, instance_name):
- raise exception.APIError("diagnostics are not supported for libvirt")
+ raise exception.APIError(_("diagnostics are not supported "
+ "for libvirt"))
def get_disks(self, instance_name):
"""
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 4f5307d80..a48bede9c 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -143,7 +143,7 @@ class Application(object):
See the end of http://pythonpaste.org/webob/modules/dec.html
for more info.
"""
- raise NotImplementedError("You must implement __call__")
+ raise NotImplementedError(_("You must implement __call__"))
class Middleware(Application):
generated by cgit (git 2.34.1) at 2026-01-06 12:00:27 +0000