merge with trunk, resolve conflicts
This commit is contained in:
Lvov Maxim
commit
23671416ce
|
|
@ -15,4 +15,5 @@ run_tests.log
|
|||
tests.sqlite
|
||||
nova/tests/instance-*
|
||||
tags
|
||||
|
||||
.coverage
|
||||
covhtml
|
||||
|
|
|
|||
1
Authors
1
Authors
|
|
@ -8,6 +8,7 @@ Anne Gentle <anne@openstack.org>
|
|||
Anthony Young <sleepsonthefloor@gmail.com>
|
||||
Antony Messerli <ant@openstack.org>
|
||||
Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
|
||||
Arvind Somya <asomya@cisco.com>
|
||||
Bilal Akhtar <bilalakhtar@ubuntu.com>
|
||||
Brian Lamar <brian.lamar@rackspace.com>
|
||||
Brian Schott <bschott@isi.edu>
|
||||
|
|
|
|||
|
|
@ -269,25 +269,64 @@ class CloudTestCase(test.TestCase):
|
|||
delete = self.cloud.delete_security_group
|
||||
self.assertRaises(exception.ApiError, delete, self.context)
|
||||
|
||||
def test_authorize_revoke_security_group_ingress(self):
|
||||
def test_authorize_security_group_ingress(self):
|
||||
kwargs = {'project_id': self.context.project_id, 'name': 'test'}
|
||||
sec = db.security_group_create(self.context, kwargs)
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'to_port': '999', 'from_port': '999', 'ip_protocol': 'tcp'}
|
||||
authz(self.context, group_name=sec['name'], **kwargs)
|
||||
self.assertTrue(authz(self.context, group_name=sec['name'], **kwargs))
|
||||
|
||||
def test_authorize_security_group_ingress_ip_permissions_ip_ranges(self):
|
||||
kwargs = {'project_id': self.context.project_id, 'name': 'test'}
|
||||
sec = db.security_group_create(self.context, kwargs)
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'ip_permissions': [{'to_port': 81, 'from_port': 81,
|
||||
'ip_ranges':
|
||||
{'1': {'cidr_ip': u'0.0.0.0/0'},
|
||||
'2': {'cidr_ip': u'10.10.10.10/32'}},
|
||||
'ip_protocol': u'tcp'}]}
|
||||
self.assertTrue(authz(self.context, group_name=sec['name'], **kwargs))
|
||||
|
||||
def test_authorize_security_group_ingress_ip_permissions_groups(self):
|
||||
kwargs = {'project_id': self.context.project_id, 'name': 'test'}
|
||||
sec = db.security_group_create(self.context, kwargs)
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'ip_permissions': [{'to_port': 81, 'from_port': 81,
|
||||
'ip_ranges':{'1': {'cidr_ip': u'0.0.0.0/0'},
|
||||
'2': {'cidr_ip': u'10.10.10.10/32'}},
|
||||
'groups': {'1': {'user_id': u'someuser',
|
||||
'group_name': u'somegroup1'},
|
||||
'2': {'user_id': u'someuser',
|
||||
'group_name': u'othergroup2'}},
|
||||
'ip_protocol': u'tcp'}]}
|
||||
self.assertTrue(authz(self.context, group_name=sec['name'], **kwargs))
|
||||
|
||||
def test_revoke_security_group_ingress(self):
|
||||
kwargs = {'project_id': self.context.project_id, 'name': 'test'}
|
||||
sec = db.security_group_create(self.context, kwargs)
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'to_port': '999', 'from_port': '999', 'ip_protocol': 'tcp'}
|
||||
authz(self.context, group_id=sec['id'], **kwargs)
|
||||
revoke = self.cloud.revoke_security_group_ingress
|
||||
self.assertTrue(revoke(self.context, group_name=sec['name'], **kwargs))
|
||||
|
||||
def test_authorize_revoke_security_group_ingress_by_id(self):
|
||||
sec = db.security_group_create(self.context,
|
||||
{'project_id': self.context.project_id,
|
||||
'name': 'test'})
|
||||
def test_revoke_security_group_ingress_by_id(self):
|
||||
kwargs = {'project_id': self.context.project_id, 'name': 'test'}
|
||||
sec = db.security_group_create(self.context, kwargs)
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'to_port': '999', 'from_port': '999', 'ip_protocol': 'tcp'}
|
||||
authz(self.context, group_id=sec['id'], **kwargs)
|
||||
revoke = self.cloud.revoke_security_group_ingress
|
||||
self.assertTrue(revoke(self.context, group_id=sec['id'], **kwargs))
|
||||
|
||||
def test_authorize_security_group_ingress_by_id(self):
|
||||
sec = db.security_group_create(self.context,
|
||||
{'project_id': self.context.project_id,
|
||||
'name': 'test'})
|
||||
authz = self.cloud.authorize_security_group_ingress
|
||||
kwargs = {'to_port': '999', 'from_port': '999', 'ip_protocol': 'tcp'}
|
||||
self.assertTrue(authz(self.context, group_id=sec['id'], **kwargs))
|
||||
|
||||
def test_authorize_security_group_ingress_missing_protocol_params(self):
|
||||
sec = db.security_group_create(self.context,
|
||||
{'project_id': self.context.project_id,
|
||||
|
|
@ -908,6 +947,21 @@ class CloudTestCase(test.TestCase):
|
|||
self._wait_for_running(ec2_instance_id)
|
||||
return ec2_instance_id
|
||||
|
||||
def test_rescue_unrescue_instance(self):
|
||||
instance_id = self._run_instance(
|
||||
image_id='ami-1',
|
||||
instance_type=FLAGS.default_instance_type,
|
||||
max_count=1)
|
||||
self.cloud.rescue_instance(context=self.context,
|
||||
instance_id=instance_id)
|
||||
# NOTE(vish): This currently does no validation, it simply makes sure
|
||||
# that the code path doesn't throw an exception.
|
||||
self.cloud.unrescue_instance(context=self.context,
|
||||
instance_id=instance_id)
|
||||
# TODO(soren): We need this until we can stop polling in the rpc code
|
||||
# for unit tests.
|
||||
self.cloud.terminate_instances(self.context, [instance_id])
|
||||
|
||||
def test_console_output(self):
|
||||
instance_id = self._run_instance(
|
||||
image_id='ami-1',
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:18+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:11+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
4
po/cs.po
4
po/cs.po
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:18+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:11+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
4
po/da.po
4
po/da.po
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:18+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
49
po/de.po
49
po/de.po
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: nova\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-02-21 10:03-0500\n"
|
||||
"PO-Revision-Date: 2011-04-03 19:42+0000\n"
|
||||
"Last-Translator: Matthias Loidolt <kedapperdrake@googlemail.com>\n"
|
||||
"PO-Revision-Date: 2011-06-06 07:58+0000\n"
|
||||
"Last-Translator: Christian Berendt <Unknown>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-04 05:19+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
@ -85,6 +85,7 @@ msgstr ""
|
|||
#, python-format
|
||||
msgid "%(param)s property not found for image %(_image_id)s"
|
||||
msgstr ""
|
||||
"Die Property %(param)s konnte im Image %(_image_id)s nicht gefunden werden"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:168
|
||||
msgid "No keypairs defined"
|
||||
|
|
@ -141,12 +142,12 @@ msgstr "PID-Datei %s existiert nicht. Läuft der Daemon nicht?\n"
|
|||
|
||||
#: ../nova/twistd.py:221
|
||||
msgid "No such process"
|
||||
msgstr ""
|
||||
msgstr "Kein passender Prozess gefunden"
|
||||
|
||||
#: ../nova/twistd.py:230 ../nova/service.py:224
|
||||
#, python-format
|
||||
msgid "Serving %s"
|
||||
msgstr ""
|
||||
msgstr "Bedient %s"
|
||||
|
||||
#: ../nova/twistd.py:262 ../nova/service.py:225
|
||||
msgid "Full set of FLAGS:"
|
||||
|
|
@ -183,12 +184,13 @@ msgstr ""
|
|||
#: ../nova/virt/xenapi/volumeops.py:91
|
||||
#, python-format
|
||||
msgid "Unable to attach volume to instance %s"
|
||||
msgstr ""
|
||||
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:93
|
||||
#, python-format
|
||||
msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
|
||||
msgstr ""
|
||||
"Einhängepunkt%(mountpoint)s zur Instanze %(instance_name)s hinzugefügt"
|
||||
|
||||
#. Detach VBD from VM
|
||||
#: ../nova/virt/xenapi/volumeops.py:104
|
||||
|
|
@ -199,7 +201,7 @@ msgstr ""
|
|||
#: ../nova/virt/xenapi/volumeops.py:112
|
||||
#, python-format
|
||||
msgid "Unable to locate volume %s"
|
||||
msgstr ""
|
||||
msgstr "Nicht möglich volume %s zufinden"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:120
|
||||
#, python-format
|
||||
|
|
@ -214,7 +216,7 @@ msgstr ""
|
|||
#: ../nova/compute/instance_types.py:41
|
||||
#, python-format
|
||||
msgid "Unknown instance type: %s"
|
||||
msgstr ""
|
||||
msgstr "Unbekannter Instanztyp: %s"
|
||||
|
||||
#: ../nova/crypto.py:46
|
||||
msgid "Filename of root CA"
|
||||
|
|
@ -230,7 +232,7 @@ msgstr "Dateiname der Certificate Revocation List"
|
|||
|
||||
#: ../nova/crypto.py:53
|
||||
msgid "Where we keep our keys"
|
||||
msgstr ""
|
||||
msgstr "Wo wir unsere Schlüssel aufbewahren"
|
||||
|
||||
#: ../nova/crypto.py:55
|
||||
msgid "Where we keep our root CA"
|
||||
|
|
@ -298,12 +300,12 @@ msgstr ""
|
|||
|
||||
#: ../nova/compute/manager.py:179
|
||||
msgid "Instance has already been created"
|
||||
msgstr ""
|
||||
msgstr "Instanz wurde bereits erstellt"
|
||||
|
||||
#: ../nova/compute/manager.py:180
|
||||
#, python-format
|
||||
msgid "instance %s: starting..."
|
||||
msgstr ""
|
||||
msgstr "Instanz %s startet..."
|
||||
|
||||
#. pylint: disable=W0702
|
||||
#: ../nova/compute/manager.py:219
|
||||
|
|
@ -314,7 +316,7 @@ msgstr ""
|
|||
#: ../nova/compute/manager.py:233 ../nova/tests/test_cloud.py:286
|
||||
#, python-format
|
||||
msgid "Terminating instance %s"
|
||||
msgstr ""
|
||||
msgstr "Beende Instanz %s"
|
||||
|
||||
#: ../nova/compute/manager.py:255
|
||||
#, python-format
|
||||
|
|
@ -377,7 +379,7 @@ msgstr ""
|
|||
#: ../nova/compute/manager.py:372
|
||||
#, python-format
|
||||
msgid "instance %s: rescuing"
|
||||
msgstr ""
|
||||
msgstr "Instanz %s: Rettung"
|
||||
|
||||
#: ../nova/compute/manager.py:387
|
||||
#, python-format
|
||||
|
|
@ -387,12 +389,12 @@ msgstr ""
|
|||
#: ../nova/compute/manager.py:406
|
||||
#, python-format
|
||||
msgid "instance %s: pausing"
|
||||
msgstr ""
|
||||
msgstr "Instanz %s pausiert"
|
||||
|
||||
#: ../nova/compute/manager.py:423
|
||||
#, python-format
|
||||
msgid "instance %s: unpausing"
|
||||
msgstr ""
|
||||
msgstr "Instanz %s wird fortgesetzt"
|
||||
|
||||
#: ../nova/compute/manager.py:440
|
||||
#, python-format
|
||||
|
|
@ -584,7 +586,7 @@ msgstr ""
|
|||
|
||||
#: ../nova/virt/connection.py:73
|
||||
msgid "Failed to open connection to the hypervisor"
|
||||
msgstr ""
|
||||
msgstr "Konnte Verbindung zum Hypervisor nicht öffnen"
|
||||
|
||||
#: ../nova/network/linux_net.py:187
|
||||
#, python-format
|
||||
|
|
@ -637,7 +639,7 @@ msgstr "Klasse %s konnte nicht gefunden werden"
|
|||
#: ../nova/utils.py:118
|
||||
#, python-format
|
||||
msgid "Fetching %s"
|
||||
msgstr ""
|
||||
msgstr "Hole %s"
|
||||
|
||||
#: ../nova/utils.py:130
|
||||
#, python-format
|
||||
|
|
@ -2562,7 +2564,7 @@ msgstr ""
|
|||
#: ../nova/auth/manager.py:270
|
||||
#, python-format
|
||||
msgid "Using project name = user name (%s)"
|
||||
msgstr ""
|
||||
msgstr "Verwende Project-Name = User-Name (%s)"
|
||||
|
||||
#: ../nova/auth/manager.py:277
|
||||
#, python-format
|
||||
|
|
@ -2572,7 +2574,7 @@ msgstr ""
|
|||
#: ../nova/auth/manager.py:279
|
||||
#, python-format
|
||||
msgid "No project called %s could be found"
|
||||
msgstr ""
|
||||
msgstr "Es konnte kein Projekt mit dem Namen %s gefunden werden"
|
||||
|
||||
#: ../nova/auth/manager.py:287
|
||||
#, python-format
|
||||
|
|
@ -2696,6 +2698,7 @@ msgstr ""
|
|||
#: ../nova/service.py:195
|
||||
msgid "The service database object disappeared, Recreating it."
|
||||
msgstr ""
|
||||
"Das Service-Datenbank-Objekt ist verschwunden, es wird erneut erzeugt."
|
||||
|
||||
#: ../nova/service.py:207
|
||||
msgid "Recovered model server connection!"
|
||||
|
|
@ -2723,7 +2726,7 @@ msgstr ""
|
|||
#: ../nova/auth/ldapdriver.py:472
|
||||
#, python-format
|
||||
msgid "Group can't be created because group %s already exists"
|
||||
msgstr ""
|
||||
msgstr "Die Gruppe %s kann nicht angelegt werde, da sie bereits existiert"
|
||||
|
||||
#: ../nova/auth/ldapdriver.py:478
|
||||
#, python-format
|
||||
|
|
@ -2739,6 +2742,7 @@ msgstr ""
|
|||
#, python-format
|
||||
msgid "User %s can't be added to the group because the user doesn't exist"
|
||||
msgstr ""
|
||||
"Der User %s kann nicht zur Gruppe hinzugefügt werde, da er nicht existiert"
|
||||
|
||||
#: ../nova/auth/ldapdriver.py:510 ../nova/auth/ldapdriver.py:521
|
||||
#, python-format
|
||||
|
|
@ -2755,6 +2759,7 @@ msgstr ""
|
|||
msgid ""
|
||||
"User %s can't be removed from the group because the user doesn't exist"
|
||||
msgstr ""
|
||||
"Der User %s kann nicht aus der Gruppe entfernt werden, da er nicht existiert"
|
||||
|
||||
#: ../nova/auth/ldapdriver.py:528
|
||||
#, python-format
|
||||
|
|
@ -2840,7 +2845,7 @@ msgstr ""
|
|||
#: ../nova/api/ec2/admin.py:200
|
||||
#, python-format
|
||||
msgid "Delete project: %s"
|
||||
msgstr ""
|
||||
msgstr "Lösche Projekt %s"
|
||||
|
||||
#: ../nova/api/ec2/admin.py:214
|
||||
#, python-format
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
139
po/es.po
139
po/es.po
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: nova\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-02-21 10:03-0500\n"
|
||||
"PO-Revision-Date: 2011-03-17 15:54+0000\n"
|
||||
"Last-Translator: Erick Huezo <erickhuezo@gmail.com>\n"
|
||||
"PO-Revision-Date: 2011-06-30 16:42+0000\n"
|
||||
"Last-Translator: David Caro <Unknown>\n"
|
||||
"Language-Team: Spanish <es@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:19+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
@ -36,10 +36,15 @@ msgid ""
|
|||
"Stdout: %(stdout)r\n"
|
||||
"Stderr: %(stderr)r"
|
||||
msgstr ""
|
||||
"%(description)s\n"
|
||||
"Comando: %(cmd)s\n"
|
||||
"Código de salida: %(exit_code)s\n"
|
||||
"Stdout: %(stdout)r\n"
|
||||
"Stderr: %(stderr)r"
|
||||
|
||||
#: ../nova/exception.py:107
|
||||
msgid "DB exception wrapped"
|
||||
msgstr ""
|
||||
msgstr "Excepción DB encapsulada"
|
||||
|
||||
#. exc_type, exc_value, exc_traceback = sys.exc_info()
|
||||
#: ../nova/exception.py:120
|
||||
|
|
@ -49,12 +54,12 @@ msgstr "Excepción no controlada"
|
|||
#: ../nova/volume/api.py:45
|
||||
#, python-format
|
||||
msgid "Quota exceeeded for %(pid)s, tried to create %(size)sG volume"
|
||||
msgstr ""
|
||||
msgstr "Cuota excedida por %(pid)s, se intentó crear el volumen %(size)sG"
|
||||
|
||||
#: ../nova/volume/api.py:47
|
||||
#, python-format
|
||||
msgid "Volume quota exceeded. You cannot create a volume of size %sG"
|
||||
msgstr "Cuota excedida. No puedes crear un volumen con tamaño %sG"
|
||||
msgstr "Cuota excedida. No puede crear un volumen con tamaño %sG"
|
||||
|
||||
#: ../nova/volume/api.py:71 ../nova/volume/api.py:96
|
||||
msgid "Volume status must be available"
|
||||
|
|
@ -83,7 +88,7 @@ msgstr "%(param)s propiedad no encontrada para la imagen %(_image_id)s"
|
|||
|
||||
#: ../nova/api/openstack/servers.py:168
|
||||
msgid "No keypairs defined"
|
||||
msgstr "No se definio una Keypairs"
|
||||
msgstr "No se definio un par de llaves (Keypair)"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:238
|
||||
#, python-format
|
||||
|
|
@ -103,7 +108,7 @@ msgstr "Compute.api::get_lock %s"
|
|||
#: ../nova/api/openstack/servers.py:281
|
||||
#, python-format
|
||||
msgid "Compute.api::reset_network %s"
|
||||
msgstr ""
|
||||
msgstr "Compute.api::reset_network %s"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:292
|
||||
#, python-format
|
||||
|
|
@ -127,16 +132,16 @@ msgstr "compute.api::resume %s"
|
|||
|
||||
#: ../nova/twistd.py:157
|
||||
msgid "Wrong number of arguments."
|
||||
msgstr "Numero de argumentos incorrectos"
|
||||
msgstr "Cantidad de argumentos incorrecta"
|
||||
|
||||
#: ../nova/twistd.py:209
|
||||
#, python-format
|
||||
msgid "pidfile %s does not exist. Daemon not running?\n"
|
||||
msgstr "el pidfile %s no existe. ¿No estará el demonio parado?\n"
|
||||
msgstr "El \"pidfile\" %s no existe. Quizás el servicio no este corriendo.\n"
|
||||
|
||||
#: ../nova/twistd.py:221
|
||||
msgid "No such process"
|
||||
msgstr "No se encontró proceso"
|
||||
msgstr "No existe el proceso"
|
||||
|
||||
#: ../nova/twistd.py:230 ../nova/service.py:224
|
||||
#, python-format
|
||||
|
|
@ -145,12 +150,12 @@ msgstr "Sirviendo %s"
|
|||
|
||||
#: ../nova/twistd.py:262 ../nova/service.py:225
|
||||
msgid "Full set of FLAGS:"
|
||||
msgstr "Conjunto completo de opciones:"
|
||||
msgstr "Conjunto completo de opciones (FLAGS):"
|
||||
|
||||
#: ../nova/twistd.py:266
|
||||
#, python-format
|
||||
msgid "Starting %s"
|
||||
msgstr "Comenzando %s"
|
||||
msgstr "Iniciando %s"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:48 ../nova/virt/xenapi/volumeops.py:101
|
||||
#: ../nova/db/sqlalchemy/api.py:731 ../nova/virt/libvirt_conn.py:741
|
||||
|
|
@ -163,17 +168,19 @@ msgstr "La instancia %s no se ha encontrado"
|
|||
#: ../nova/virt/xenapi/volumeops.py:51
|
||||
#, python-format
|
||||
msgid "Attach_volume: %(instance_name)s, %(device_path)s, %(mountpoint)s"
|
||||
msgstr ""
|
||||
msgstr "Volumen_unido: %(instance_name)s, %(device_path)s, %(mountpoint)s"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:69
|
||||
#, python-format
|
||||
msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
|
||||
msgstr ""
|
||||
"No es posible crear el VDI en SR %(sr_ref)s para la instancia "
|
||||
"%(instance_name)s"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:80
|
||||
#, python-format
|
||||
msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
|
||||
msgstr ""
|
||||
msgstr "No es posible usar SR %(sr_ref)s para la instancia %(instance_name)s"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:91
|
||||
#, python-format
|
||||
|
|
@ -184,12 +191,14 @@ msgstr "Imposible adjuntar volumen a la instancia %s"
|
|||
#, python-format
|
||||
msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
|
||||
msgstr ""
|
||||
"El punto de montaje %(mountpoint)s esta unido a la instancia "
|
||||
"%(instance_name)s"
|
||||
|
||||
#. Detach VBD from VM
|
||||
#: ../nova/virt/xenapi/volumeops.py:104
|
||||
#, python-format
|
||||
msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
|
||||
msgstr ""
|
||||
msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
|
||||
|
||||
#: ../nova/virt/xenapi/volumeops.py:112
|
||||
#, python-format
|
||||
|
|
@ -205,6 +214,8 @@ msgstr "Imposible desasociar volumen %s"
|
|||
#, python-format
|
||||
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
|
||||
msgstr ""
|
||||
"El punto de montaje %(mountpoint)s se desligó de la instancia "
|
||||
"%(instance_name)s"
|
||||
|
||||
#: ../nova/compute/instance_types.py:41
|
||||
#, python-format
|
||||
|
|
@ -259,7 +270,7 @@ msgstr ""
|
|||
#: ../nova/crypto.py:258
|
||||
#, python-format
|
||||
msgid "Flags path: %s"
|
||||
msgstr ""
|
||||
msgstr "Ruta a las opciones: %s"
|
||||
|
||||
#: ../nova/scheduler/manager.py:69
|
||||
#, python-format
|
||||
|
|
@ -276,6 +287,7 @@ msgstr "check_instance_lock: decorating: |%s|"
|
|||
msgid ""
|
||||
"check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_id)s|"
|
||||
msgstr ""
|
||||
"check_instance_lock: argumentos: |%(self)s| |%(context)s| |%(instance_id)s|"
|
||||
|
||||
#: ../nova/compute/manager.py:84
|
||||
#, python-format
|
||||
|
|
@ -338,6 +350,8 @@ msgid ""
|
|||
"trying to reboot a non-running instance: %(instance_id)s (state: %(state)s "
|
||||
"expected: %(running)s)"
|
||||
msgstr ""
|
||||
"intentando reiniciar una instancia no ejecutada: %(instance_id)s (state: "
|
||||
"%(state)s expected: %(running)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:311
|
||||
#, python-format
|
||||
|
|
@ -350,6 +364,8 @@ msgid ""
|
|||
"trying to snapshot a non-running instance: %(instance_id)s (state: %(state)s "
|
||||
"expected: %(running)s)"
|
||||
msgstr ""
|
||||
"intentando crear una imagen instantanea(snapshot) de una maquina no "
|
||||
"ejecutada: %(instance_id)s (state: %(state)s expected: %(running)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:332
|
||||
#, python-format
|
||||
|
|
@ -357,11 +373,13 @@ msgid ""
|
|||
"trying to reset the password on a non-running instance: %(instance_id)s "
|
||||
"(state: %(instance_state)s expected: %(expected_state)s)"
|
||||
msgstr ""
|
||||
"intentando restablecer el password en una instancia: %(instance_id)s "
|
||||
"(estado: %(instance_state)s esperado: %(expected_state)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:335
|
||||
#, python-format
|
||||
msgid "instance %s: setting admin password"
|
||||
msgstr ""
|
||||
msgstr "instancia %s: estableciendo password de administrador"
|
||||
|
||||
#: ../nova/compute/manager.py:353
|
||||
#, python-format
|
||||
|
|
@ -369,11 +387,13 @@ msgid ""
|
|||
"trying to inject a file into a non-running instance: %(instance_id)s (state: "
|
||||
"%(instance_state)s expected: %(expected_state)s)"
|
||||
msgstr ""
|
||||
"intentando inyectar un archivo dentro de una instancia parada: "
|
||||
"%(instance_id)s (estado: %(instance_state)s esperado: %(expected_state)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:362
|
||||
#, python-format
|
||||
msgid "instance %(nm)s: injecting file to %(plain_path)s"
|
||||
msgstr ""
|
||||
msgstr "instancia %(nm)s: inyectando archivo en %(plain_path)s"
|
||||
|
||||
#: ../nova/compute/manager.py:372
|
||||
#, python-format
|
||||
|
|
@ -393,7 +413,7 @@ msgstr "instancia %s: pausando"
|
|||
#: ../nova/compute/manager.py:423
|
||||
#, python-format
|
||||
msgid "instance %s: unpausing"
|
||||
msgstr "instnacia %s: continuando tras pausa"
|
||||
msgstr "instancia %s: continuando tras pausa"
|
||||
|
||||
#: ../nova/compute/manager.py:440
|
||||
#, python-format
|
||||
|
|
@ -403,7 +423,7 @@ msgstr "instancia %s: obteniendo los diagnosticos"
|
|||
#: ../nova/compute/manager.py:453
|
||||
#, python-format
|
||||
msgid "instance %s: suspending"
|
||||
msgstr ""
|
||||
msgstr "instancia %s: suspendiendo"
|
||||
|
||||
#: ../nova/compute/manager.py:472
|
||||
#, python-format
|
||||
|
|
@ -501,7 +521,7 @@ msgstr "Exportando de nuevo los volumenes %s"
|
|||
#: ../nova/volume/manager.py:90
|
||||
#, python-format
|
||||
msgid "volume %s: skipping export"
|
||||
msgstr ""
|
||||
msgstr "volume %s: saltando exportación"
|
||||
|
||||
#: ../nova/volume/manager.py:96
|
||||
#, python-format
|
||||
|
|
@ -511,7 +531,7 @@ msgstr "volumen %s: creando"
|
|||
#: ../nova/volume/manager.py:108
|
||||
#, python-format
|
||||
msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
|
||||
msgstr ""
|
||||
msgstr "volume %(vol_name)s: creando lv del tamaño %(vol_size)sG"
|
||||
|
||||
#: ../nova/volume/manager.py:112
|
||||
#, python-format
|
||||
|
|
@ -549,7 +569,7 @@ msgstr "volumen %s: eliminado satisfactoriamente"
|
|||
#: ../nova/virt/xenapi/fake.py:74
|
||||
#, python-format
|
||||
msgid "%(text)s: _db_content => %(content)s"
|
||||
msgstr ""
|
||||
msgstr "%(text)s: _db_content => %(content)s"
|
||||
|
||||
#: ../nova/virt/xenapi/fake.py:304 ../nova/virt/xenapi/fake.py:404
|
||||
#: ../nova/virt/xenapi/fake.py:422 ../nova/virt/xenapi/fake.py:478
|
||||
|
|
@ -564,7 +584,7 @@ msgstr "xenapi.fake no tiene una implementación para %s"
|
|||
#: ../nova/virt/xenapi/fake.py:341
|
||||
#, python-format
|
||||
msgid "Calling %(localname)s %(impl)s"
|
||||
msgstr ""
|
||||
msgstr "Llamando %(localname)s %(impl)s"
|
||||
|
||||
#: ../nova/virt/xenapi/fake.py:346
|
||||
#, python-format
|
||||
|
|
@ -618,12 +638,12 @@ msgstr "El pid %d está pasado, relanzando dnsmasq"
|
|||
#: ../nova/network/linux_net.py:358
|
||||
#, python-format
|
||||
msgid "killing radvd threw %s"
|
||||
msgstr ""
|
||||
msgstr "Matando radvd lanzado %s"
|
||||
|
||||
#: ../nova/network/linux_net.py:360
|
||||
#, python-format
|
||||
msgid "Pid %d is stale, relaunching radvd"
|
||||
msgstr ""
|
||||
msgstr "Pid %d corrupto, relanzando radvd"
|
||||
|
||||
#. pylint: disable=W0703
|
||||
#: ../nova/network/linux_net.py:449
|
||||
|
|
@ -659,7 +679,7 @@ msgstr "El resultado fue %s"
|
|||
#: ../nova/utils.py:159
|
||||
#, python-format
|
||||
msgid "Running cmd (SSH): %s"
|
||||
msgstr ""
|
||||
msgstr "corriendo cmd (SSH): %s"
|
||||
|
||||
#: ../nova/utils.py:217
|
||||
#, python-format
|
||||
|
|
@ -674,12 +694,12 @@ msgstr "Ejecutando %s"
|
|||
#: ../nova/utils.py:262
|
||||
#, python-format
|
||||
msgid "Link Local address is not found.:%s"
|
||||
msgstr ""
|
||||
msgstr "No se encuentra la dirección del enlace local.:%s"
|
||||
|
||||
#: ../nova/utils.py:265
|
||||
#, python-format
|
||||
msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
|
||||
msgstr ""
|
||||
msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
|
||||
|
||||
#: ../nova/utils.py:363
|
||||
#, python-format
|
||||
|
|
@ -694,7 +714,7 @@ msgstr "backend %s"
|
|||
#: ../nova/fakerabbit.py:49
|
||||
#, python-format
|
||||
msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
|
||||
msgstr ""
|
||||
msgstr "(%(nm)s) publica (key: %(routing_key)s) %(message)s"
|
||||
|
||||
#: ../nova/fakerabbit.py:54
|
||||
#, python-format
|
||||
|
|
@ -714,12 +734,12 @@ msgstr "Declarando intercambio %s"
|
|||
#: ../nova/fakerabbit.py:96
|
||||
#, python-format
|
||||
msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
|
||||
msgstr ""
|
||||
msgstr "Enlazando %(queue)s a %(exchange)s con la llave %(routing_key)s"
|
||||
|
||||
#: ../nova/fakerabbit.py:121
|
||||
#, python-format
|
||||
msgid "Getting from %(queue)s: %(message)s"
|
||||
msgstr ""
|
||||
msgstr "Obtendiendo desde %(queue)s: %(message)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:135 ../nova/virt/hyperv.py:171
|
||||
#, python-format
|
||||
|
|
@ -729,17 +749,17 @@ msgstr "Creada VM %s..."
|
|||
#: ../nova/virt/xenapi/vm_utils.py:138
|
||||
#, python-format
|
||||
msgid "Created VM %(instance_name)s as %(vm_ref)s."
|
||||
msgstr ""
|
||||
msgstr "VM creada %(instance_name)s como %(vm_ref)s."
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:168
|
||||
#, python-format
|
||||
msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
|
||||
msgstr ""
|
||||
msgstr "Creando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:171
|
||||
#, python-format
|
||||
msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
|
||||
msgstr ""
|
||||
msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:187
|
||||
#, python-format
|
||||
|
|
@ -759,12 +779,12 @@ msgstr "Imposible destruir VBD %s"
|
|||
#: ../nova/virt/xenapi/vm_utils.py:224
|
||||
#, python-format
|
||||
msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
|
||||
msgstr ""
|
||||
msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:227
|
||||
#, python-format
|
||||
msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
|
||||
msgstr ""
|
||||
msgstr "Creado el VIF %(vif_ref)s para VM %(vm_ref)s, red %(network_ref)s."
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:246
|
||||
#, python-format
|
||||
|
|
@ -772,50 +792,52 @@ msgid ""
|
|||
"Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on "
|
||||
"%(sr_ref)s."
|
||||
msgstr ""
|
||||
"VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
|
||||
"sobre %(sr_ref)s."
|
||||
|
||||
#. TODO(sirp): Add quiesce and VSS locking support when Windows support
|
||||
#. is added
|
||||
#: ../nova/virt/xenapi/vm_utils.py:258
|
||||
#, python-format
|
||||
msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
|
||||
msgstr ""
|
||||
msgstr "Creando snapshot de la VM %(vm_ref)s con etiqueta '%(label)s'..."
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:272
|
||||
#, python-format
|
||||
msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
|
||||
msgstr ""
|
||||
msgstr "Instantánea creada %(template_vm_ref)s de la VM %(vm_ref)s."
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:286
|
||||
#, python-format
|
||||
msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
|
||||
msgstr ""
|
||||
msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:327
|
||||
#, python-format
|
||||
msgid "Size for image %(image)s:%(virtual_size)d"
|
||||
msgstr ""
|
||||
msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:332
|
||||
#, python-format
|
||||
msgid "Glance image %s"
|
||||
msgstr ""
|
||||
msgstr "Imagen Glance %s"
|
||||
|
||||
#. we need to invoke a plugin for copying VDI's
|
||||
#. content into proper path
|
||||
#: ../nova/virt/xenapi/vm_utils.py:342
|
||||
#, python-format
|
||||
msgid "Copying VDI %s to /boot/guest on dom0"
|
||||
msgstr ""
|
||||
msgstr "Copiando VDI %s a /boot/guest on dom0"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:352
|
||||
#, python-format
|
||||
msgid "Kernel/Ramdisk VDI %s destroyed"
|
||||
msgstr ""
|
||||
msgstr "Kernel/Ramdisk VDI %s destruído"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:361
|
||||
#, python-format
|
||||
msgid "Asking xapi to fetch %(url)s as %(access)s"
|
||||
msgstr ""
|
||||
msgstr "Pidiendo a xapi que descargue %(url)s como %(access)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:386 ../nova/virt/xenapi/vm_utils.py:402
|
||||
#, python-format
|
||||
|
|
@ -825,21 +847,21 @@ msgstr "Buscando vid %s para el kernel PV"
|
|||
#: ../nova/virt/xenapi/vm_utils.py:397
|
||||
#, python-format
|
||||
msgid "PV Kernel in VDI:%s"
|
||||
msgstr ""
|
||||
msgstr "Kernel PV en VDI:%s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:405
|
||||
#, python-format
|
||||
msgid "Running pygrub against %s"
|
||||
msgstr ""
|
||||
msgstr "Ejecutando pygrub contra %s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:411
|
||||
#, python-format
|
||||
msgid "Found Xen kernel %s"
|
||||
msgstr ""
|
||||
msgstr "Kernel Xen Encontrado %s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:413
|
||||
msgid "No Xen kernel found. Booting HVM."
|
||||
msgstr ""
|
||||
msgstr "Kernel Xen no encontrado. Reiniciando HVM"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:425 ../nova/virt/hyperv.py:431
|
||||
#, python-format
|
||||
|
|
@ -864,7 +886,7 @@ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
|
|||
#: ../nova/virt/xenapi/vm_utils.py:525
|
||||
#, python-format
|
||||
msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
|
||||
msgstr ""
|
||||
msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:542
|
||||
#, python-format
|
||||
|
|
@ -893,18 +915,19 @@ msgstr "No se han encontrado VDI's para VM %s"
|
|||
#, python-format
|
||||
msgid "Unexpected number of VDIs (%(num_vdis)s) found for VM %(vm_ref)s"
|
||||
msgstr ""
|
||||
"Numero de VDIs inesperado (%(num_vdis)s) encontrados por VM %(vm_ref)s"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:653
|
||||
#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:188
|
||||
#, python-format
|
||||
msgid "Creating VBD for VDI %s ... "
|
||||
msgstr ""
|
||||
msgstr "Creando VBD para VDI %s ... "
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:655
|
||||
#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:190
|
||||
#, python-format
|
||||
msgid "Creating VBD for VDI %s done."
|
||||
msgstr ""
|
||||
msgstr "Creando VBF para VDI %s terminado"
|
||||
|
||||
#: ../nova/virt/xenapi/vm_utils.py:657
|
||||
#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:192
|
||||
|
|
@ -2850,12 +2873,12 @@ msgstr ""
|
|||
#: ../nova/api/ec2/admin.py:177
|
||||
#, python-format
|
||||
msgid "Create project %(name)s managed by %(manager_user)s"
|
||||
msgstr ""
|
||||
msgstr "Crear proyecto %(name)s administrador por %(manager_user)s"
|
||||
|
||||
#: ../nova/api/ec2/admin.py:190
|
||||
#, python-format
|
||||
msgid "Modify project: %(name)s managed by %(manager_user)s"
|
||||
msgstr ""
|
||||
msgstr "Modificar proyecto: %(name)s administrado por %(manager_user)s"
|
||||
|
||||
#: ../nova/api/ec2/admin.py:200
|
||||
#, python-format
|
||||
|
|
@ -2865,12 +2888,12 @@ msgstr "Borrar proyecto: %s"
|
|||
#: ../nova/api/ec2/admin.py:214
|
||||
#, python-format
|
||||
msgid "Adding user %(user)s to project %(project)s"
|
||||
msgstr ""
|
||||
msgstr "Agregando usuario %(user)s al proyecto %(project)s"
|
||||
|
||||
#: ../nova/api/ec2/admin.py:218
|
||||
#, python-format
|
||||
msgid "Removing user %(user)s from project %(project)s"
|
||||
msgstr ""
|
||||
msgstr "Eliminando el usuario %(user)s del proyecto %(project)s"
|
||||
|
||||
#, python-format
|
||||
#~ msgid ""
|
||||
|
|
|
|||
4
po/it.po
4
po/it.po
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:19+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-25 05:22+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
22
po/ru.po
22
po/ru.po
|
|
@ -8,20 +8,20 @@ msgstr ""
|
|||
"Project-Id-Version: nova\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-02-21 10:03-0500\n"
|
||||
"PO-Revision-Date: 2011-03-30 07:06+0000\n"
|
||||
"Last-Translator: Andrey Olykainen <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-07-09 07:20+0000\n"
|
||||
"Last-Translator: ilya kislicyn <Unknown>\n"
|
||||
"Language-Team: Russian <ru@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-31 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
#: ../nova/scheduler/simple.py:122
|
||||
msgid "No hosts found"
|
||||
msgstr ""
|
||||
msgstr "Узлы не найдены"
|
||||
|
||||
#: ../nova/exception.py:33
|
||||
msgid "Unexpected error while running command."
|
||||
|
|
@ -54,7 +54,7 @@ msgstr ""
|
|||
#: ../nova/volume/api.py:47
|
||||
#, python-format
|
||||
msgid "Volume quota exceeded. You cannot create a volume of size %sG"
|
||||
msgstr ""
|
||||
msgstr "Квота тома превышена. Вы не можете создать том размером %sG"
|
||||
|
||||
#: ../nova/volume/api.py:71 ../nova/volume/api.py:96
|
||||
msgid "Volume status must be available"
|
||||
|
|
@ -62,19 +62,19 @@ msgstr ""
|
|||
|
||||
#: ../nova/volume/api.py:98
|
||||
msgid "Volume is already attached"
|
||||
msgstr ""
|
||||
msgstr "Том уже смотирован"
|
||||
|
||||
#: ../nova/volume/api.py:104
|
||||
msgid "Volume is already detached"
|
||||
msgstr ""
|
||||
msgstr "Том уже отмонтирован"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:72
|
||||
msgid "Failed to read private ip"
|
||||
msgstr ""
|
||||
msgstr "Ошибка чтения приватного IP адреса"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:79
|
||||
msgid "Failed to read public ip(s)"
|
||||
msgstr ""
|
||||
msgstr "Ошибка чтения публичных IP адресов"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:152
|
||||
#, python-format
|
||||
|
|
@ -83,7 +83,7 @@ msgstr ""
|
|||
|
||||
#: ../nova/api/openstack/servers.py:168
|
||||
msgid "No keypairs defined"
|
||||
msgstr ""
|
||||
msgstr "Не определены ключевые пары"
|
||||
|
||||
#: ../nova/api/openstack/servers.py:238
|
||||
#, python-format
|
||||
|
|
|
|||
4
po/uk.po
4
po/uk.po
|
|
@ -14,8 +14,8 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-03-19 06:19+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/scheduler/chance.py:37 ../nova/scheduler/zone.py:55
|
||||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
|
|
|
|||
27
po/zh_CN.po
27
po/zh_CN.po
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: nova\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-02-21 10:03-0500\n"
|
||||
"PO-Revision-Date: 2011-04-07 05:01+0000\n"
|
||||
"Last-Translator: ben <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-06-14 14:44+0000\n"
|
||||
"Last-Translator: chong <Unknown>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-08 05:28+0000\n"
|
||||
"X-Generator: Launchpad (build 12735)\n"
|
||||
"X-Launchpad-Export-Date: 2011-07-23 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 13405)\n"
|
||||
|
||||
#: ../nova/twistd.py:266
|
||||
#, python-format
|
||||
|
|
@ -26,7 +26,7 @@ msgstr "启动 %s 中"
|
|||
#: ../nova/scheduler/simple.py:75 ../nova/scheduler/simple.py:110
|
||||
#: ../nova/scheduler/simple.py:122
|
||||
msgid "No hosts found"
|
||||
msgstr "未找到主机"
|
||||
msgstr "没有找到主机"
|
||||
|
||||
#: ../nova/exception.py:33
|
||||
msgid "Unexpected error while running command."
|
||||
|
|
@ -41,6 +41,11 @@ msgid ""
|
|||
"Stdout: %(stdout)r\n"
|
||||
"Stderr: %(stderr)r"
|
||||
msgstr ""
|
||||
"%(description)s\n"
|
||||
"命令: %(cmd)s\n"
|
||||
"退出代码: %(exit_code)s\n"
|
||||
"标准输出: %(stdout)r\n"
|
||||
"标准出错: %(stderr)r"
|
||||
|
||||
#: ../nova/exception.py:107
|
||||
msgid "DB exception wrapped"
|
||||
|
|
@ -309,17 +314,17 @@ msgstr ""
|
|||
#: ../nova/compute/manager.py:233 ../nova/tests/test_cloud.py:286
|
||||
#, python-format
|
||||
msgid "Terminating instance %s"
|
||||
msgstr ""
|
||||
msgstr "正在结束实例 %s"
|
||||
|
||||
#: ../nova/compute/manager.py:255
|
||||
#, python-format
|
||||
msgid "Deallocating address %s"
|
||||
msgstr ""
|
||||
msgstr "取消分配地址 %s"
|
||||
|
||||
#: ../nova/compute/manager.py:268
|
||||
#, python-format
|
||||
msgid "trying to destroy already destroyed instance: %s"
|
||||
msgstr ""
|
||||
msgstr "尝试销毁已经销毁的实例: %s"
|
||||
|
||||
#: ../nova/compute/manager.py:282
|
||||
#, python-format
|
||||
|
|
@ -331,12 +336,12 @@ msgstr "重启虚拟机 %s"
|
|||
msgid ""
|
||||
"trying to reboot a non-running instance: %(instance_id)s (state: %(state)s "
|
||||
"expected: %(running)s)"
|
||||
msgstr ""
|
||||
msgstr "尝试重启没有在运行中实例: %(instance_id)s (状态: %(state)s 预料: %(running)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:311
|
||||
#, python-format
|
||||
msgid "instance %s: snapshotting"
|
||||
msgstr ""
|
||||
msgstr "实例 %s: 快照中"
|
||||
|
||||
#: ../nova/compute/manager.py:316
|
||||
#, python-format
|
||||
|
|
@ -351,6 +356,8 @@ msgid ""
|
|||
"trying to reset the password on a non-running instance: %(instance_id)s "
|
||||
"(state: %(instance_state)s expected: %(expected_state)s)"
|
||||
msgstr ""
|
||||
"尝试对没有在运行的实例重置密码: %(instance_id)s (状态: %(instance_state)s 预料: "
|
||||
"%(expected_state)s)"
|
||||
|
||||
#: ../nova/compute/manager.py:335
|
||||
#, python-format
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
18
run_tests.sh
18
run_tests.sh
|
|
@ -11,6 +11,7 @@ function usage {
|
|||
echo " -x, --stop Stop running tests after the first error or failure."
|
||||
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
|
||||
echo " -p, --pep8 Just run pep8"
|
||||
echo " -c, --coverage Generate coverage report"
|
||||
echo " -h, --help Print this usage message"
|
||||
echo " --hide-elapsed Don't print the elapsed time for each test along with slow test list"
|
||||
echo ""
|
||||
|
|
@ -29,6 +30,7 @@ function process_option {
|
|||
-n|--no-recreate-db) let recreate_db=0;;
|
||||
-f|--force) let force=1;;
|
||||
-p|--pep8) let just_pep8=1;;
|
||||
-c|--coverage) let coverage=1;;
|
||||
-*) noseopts="$noseopts $1";;
|
||||
*) noseargs="$noseargs $1"
|
||||
esac
|
||||
|
|
@ -43,12 +45,18 @@ noseargs=
|
|||
noseopts=
|
||||
wrapper=""
|
||||
just_pep8=0
|
||||
coverage=0
|
||||
recreate_db=1
|
||||
|
||||
for arg in "$@"; do
|
||||
process_option $arg
|
||||
done
|
||||
|
||||
# If enabled, tell nose to collect coverage data
|
||||
if [ $coverage -eq 1 ]; then
|
||||
noseopts="$noseopts --with-coverage --cover-package=nova"
|
||||
fi
|
||||
|
||||
function run_tests {
|
||||
# Just run the test suites in current environment
|
||||
${wrapper} $NOSETESTS 2> run_tests.log
|
||||
|
|
@ -108,6 +116,11 @@ then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Delete old coverage data from previous runs
|
||||
if [ $coverage -eq 1 ]; then
|
||||
${wrapper} coverage erase
|
||||
fi
|
||||
|
||||
if [ $just_pep8 -eq 1 ]; then
|
||||
run_pep8
|
||||
exit
|
||||
|
|
@ -126,3 +139,8 @@ run_tests || exit
|
|||
if [ -z "$noseargs" ]; then
|
||||
run_pep8
|
||||
fi
|
||||
|
||||
if [ $coverage -eq 1 ]; then
|
||||
echo "Generating coverage report in covhtml/"
|
||||
${wrapper} coverage html -d covhtml -i
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue