openstack/nova
Code Issues Proposed changes

i18n raise Exception messages

Browse Source 
Provide i18n to some exceptions that were not
provided before.

Change-Id: Ia320ba5f12e82686c8ee7973a77f152eb4b02bd4
Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
Chuck Short 2012-12-10 12:24:07 -06:00
parent 2f962f50e4
commit c454606ada
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/nova-manage
View File

@ -523,15 +523,16 @@ class NetworkCommands(object):
"""Deletes a network"""
if fixed_range is None and uuid is None:
raise Exception("Please specify either fixed_range or uuid")
raise Exception(_("Please specify either fixed_range or uuid"))
net_manager = importutils.import_object(CONF.network_manager)
if "QuantumManager" in CONF.network_manager:
if uuid is None:
raise Exception("UUID is required to delete Quantum Networks")
raise Exception(_("UUID is required to delete "
"Quantum Networks"))
if fixed_range:
raise Exception("Deleting by fixed_range is not supported "
"with the QuantumManager")
raise Exception(_("Deleting by fixed_range is not supported "
"with the QuantumManager"))
# delete the network
net_manager.delete_network(context.get_admin_context(),
fixed_range, uuid)

4
bin/nova-novncproxy
View File

@ -91,7 +91,7 @@ class NovaWebSocketProxy(websockify.WebSocketProxy):
if not connect_info:
LOG.audit("Invalid Token: %s", token)
raise Exception("Invalid Token")
raise Exception(_("Invalid Token"))
host = connect_info['host']
port = int(connect_info['port'])
@ -110,7 +110,7 @@ class NovaWebSocketProxy(websockify.WebSocketProxy):
if data.find("\r\n\r\n") != -1:
if not data.split("\r\n")[0].find("200"):
LOG.audit("Invalid Connection Info %s", token)
raise Exception("Invalid Connection Info")
raise Exception(_("Invalid Connection Info"))
tsock.recv(len(data))
break

2
nova/network/quantumv2/api.py
View File

@ -147,7 +147,7 @@ class API(base.Base):
for port_id in touched_port_ids:
port_in_server = quantum.show_port(port_id).get('port')
if not port_in_server:
raise Exception('Port have already lost')
raise Exception(_('Port not found'))
port_req_body = {'port': {'device_id': None}}
quantum.update_port(port_id, port_req_body)

2
tools/db/schema_diff.py
View File

@ -107,7 +107,7 @@ def _get_db_driver_class(db_type):
elif db_type == "postgres":
return Postgres
else:
raise Exception("database %s not supported" % db_type)
raise Exception(_("database %s not supported") % db_type)
### Migrate