summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/api/openstack/compute/contrib/floating_ips.py8
-rw-r--r--nova/api/openstack/compute/contrib/services.py18
-rw-r--r--nova/cells/manager.py20
-rw-r--r--nova/cells/messaging.py35
-rw-r--r--nova/cells/rpcapi.py16
-rw-r--r--nova/compute/api.py9
-rw-r--r--nova/compute/cells_api.py13
-rw-r--r--nova/compute/claims.py7
-rwxr-xr-xnova/compute/manager.py21
-rw-r--r--nova/compute/resource_tracker.py29
-rw-r--r--nova/consoleauth/manager.py2
-rw-r--r--nova/db/api.py39
-rw-r--r--nova/db/sqlalchemy/api.py157
-rw-r--r--nova/locale/bs/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/cs/LC_MESSAGES/nova.po545
-rw-r--r--nova/locale/da/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/de/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/en_AU/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/en_GB/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/en_US/LC_MESSAGES/nova.po546
-rw-r--r--nova/locale/es/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/fr/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/it/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/ja/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/ko/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/nb/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/nova.pot536
-rw-r--r--nova/locale/pt_BR/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/ru/LC_MESSAGES/nova.po543
-rw-r--r--nova/locale/tl/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/tr/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/tr_TR/LC_MESSAGES/nova.po545
-rw-r--r--nova/locale/uk/LC_MESSAGES/nova.po542
-rw-r--r--nova/locale/zh_CN/LC_MESSAGES/nova.po545
-rw-r--r--nova/locale/zh_TW/LC_MESSAGES/nova.po543
-rw-r--r--nova/openstack/common/loopingcall.py147
-rw-r--r--nova/service.py3
-rw-r--r--nova/servicegroup/drivers/db.py4
-rw-r--r--nova/servicegroup/drivers/mc.py5
-rw-r--r--nova/servicegroup/drivers/zk.py4
-rw-r--r--nova/storage/linuxscsi.py6
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_floating_ips.py19
-rw-r--r--nova/tests/cells/test_cells_manager.py20
-rw-r--r--nova/tests/cells/test_cells_messaging.py37
-rw-r--r--nova/tests/cells/test_cells_rpcapi.py14
-rw-r--r--nova/tests/compute/test_claims.py2
-rw-r--r--nova/tests/compute/test_compute.py28
-rw-r--r--nova/tests/compute/test_host_api.py39
-rw-r--r--nova/tests/compute/test_resource_tracker.py4
-rw-r--r--nova/tests/consoleauth/test_consoleauth.py61
-rw-r--r--nova/tests/test_db_api.py300
-rw-r--r--nova/tests/test_libvirt.py17
-rw-r--r--nova/tests/test_powervm.py57
-rw-r--r--nova/utils.py108
-rw-r--r--nova/virt/baremetal/ipmi.py13
-rw-r--r--nova/virt/baremetal/pxe.py10
-rwxr-xr-xnova/virt/libvirt/driver.py48
-rw-r--r--nova/virt/libvirt/volume.py13
-rw-r--r--nova/virt/powervm/operator.py24
-rwxr-xr-xnova/virt/vmwareapi/driver.py7
-rw-r--r--openstack-common.conf1
61 files changed, 7388 insertions, 5919 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index bf1246ccb..7be479e5a 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -160,12 +160,12 @@ class FloatingIPController(object):
try:
address = self.network_api.allocate_floating_ip(context, pool)
ip = self.network_api.get_floating_ip_by_address(context, address)
- except exception.NoMoreFloatingIps, nmfi:
+ except exception.NoMoreFloatingIps:
if pool:
- nmfi.message = _("No more floating ips in pool %s.") % pool
+ msg = _("No more floating ips in pool %s.") % pool
else:
- nmfi.message = _("No more floating ips available.")
- raise
+ msg = _("No more floating ips available.")
+ raise webob.exc.HTTPNotFound(explanation=msg)
return _translate_floating_ip_view(ip)
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index d948c8bc5..9952484f7 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -21,7 +21,6 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import compute
-from nova import db
from nova import exception
from nova.openstack.common import timeutils
from nova import utils
@@ -121,7 +120,10 @@ class ServiceController(object):
elif id == "disable":
disabled = True
else:
- raise webob.exc.HTTPNotFound("Unknown action")
+ raise webob.exc.HTTPNotFound(_("Unknown action"))
+
+ status = id + 'd'
+
try:
host = body['host']
binary = body['binary']
@@ -129,15 +131,11 @@ class ServiceController(object):
raise webob.exc.HTTPUnprocessableEntity()
try:
- svc = db.service_get_by_args(context, host, binary)
- if not svc:
- raise webob.exc.HTTPNotFound('Unknown service')
+ svc = self.host_api.service_update(context, host, binary,
+ {'disabled': disabled})
+ except exception.ServiceNotFound as exc:
+ raise webob.exc.HTTPNotFound(_("Unknown service"))
- db.service_update(context, svc['id'], {'disabled': disabled})
- except exception.ServiceNotFound:
- raise webob.exc.HTTPNotFound("service not found")
-
- status = id + 'd'
return {'service': {'host': host, 'binary': binary, 'status': status}}
diff --git a/nova/cells/manager.py b/nova/cells/manager.py
index 96e8ca8d8..6c44d0cba 100644
--- a/nova/cells/manager.py
+++ b/nova/cells/manager.py
@@ -63,7 +63,7 @@ class CellsManager(manager.Manager):
Scheduling requests get passed to the scheduler class.
"""
- RPC_API_VERSION = '1.6'
+ RPC_API_VERSION = '1.7'
def __init__(self, *args, **kwargs):
# Mostly for tests.
@@ -251,6 +251,24 @@ class CellsManager(manager.Manager):
cells_utils.add_cell_to_service(service, response.cell_name)
return service
+ def service_update(self, ctxt, host_name, binary, params_to_update):
+ """
+ Used to enable/disable a service. For compute services, setting to
+ disabled stops new builds arriving on that host.
+
+ :param host_name: the name of the host machine that the service is
+ running
+ :param binary: The name of the executable that the service runs as
+ :param params_to_update: eg. {'disabled': True}
+ :returns: the service reference
+ """
+ cell_name, host_name = cells_utils.split_cell_and_item(host_name)
+ response = self.msg_runner.service_update(
+ ctxt, cell_name, host_name, binary, params_to_update)
+ service = response.value_or_raise()
+ cells_utils.add_cell_to_service(service, response.cell_name)
+ return service
+
def proxy_rpc_to_manager(self, ctxt, topic, rpc_message, call, timeout):
"""Proxy an RPC message as-is to a manager."""
compute_topic = CONF.compute_topic
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py
index 02044ffd5..2e2fa735a 100644
--- a/nova/cells/messaging.py
+++ b/nova/cells/messaging.py
@@ -603,6 +603,7 @@ class _BaseMessageMethods(base.Base):
self.compute_api = compute.API()
self.compute_rpcapi = compute_rpcapi.ComputeAPI()
self.consoleauth_rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
+ self.host_api = compute.HostAPI()
def task_log_get_all(self, message, task_name, period_beginning,
period_ending, host, state):
@@ -705,6 +706,20 @@ class _TargetedMessageMethods(_BaseMessageMethods):
host_name)
return jsonutils.to_primitive(service)
+ def service_update(self, message, host_name, binary, params_to_update):
+ """
+ Used to enable/disable a service. For compute services, setting to
+ disabled stops new builds arriving on that host.
+
+ :param host_name: the name of the host machine that the service is
+ running
+ :param binary: The name of the executable that the service runs as
+ :param params_to_update: eg. {'disabled': True}
+ """
+ return jsonutils.to_primitive(
+ self.host_api.service_update(message.ctxt, host_name, binary,
+ params_to_update))
+
def proxy_rpc_to_manager(self, message, host_name, rpc_message,
topic, timeout):
"""Proxy RPC to the given compute topic."""
@@ -1168,6 +1183,26 @@ class MessageRunner(object):
need_response=True)
return message.process()
+ def service_update(self, ctxt, cell_name, host_name, binary,
+ params_to_update):
+ """
+ Used to enable/disable a service. For compute services, setting to
+ disabled stops new builds arriving on that host.
+
+ :param host_name: the name of the host machine that the service is
+ running
+ :param binary: The name of the executable that the service runs as
+ :param params_to_update: eg. {'disabled': True}
+ :returns: the update service object
+ """
+ method_kwargs = dict(host_name=host_name, binary=binary,
+ params_to_update=params_to_update)
+ message = _TargetedMessage(self, ctxt,
+ 'service_update',
+ method_kwargs, 'down', cell_name,
+ need_response=True)
+ return message.process()
+
def proxy_rpc_to_manager(self, ctxt, cell_name, host_name, topic,
rpc_message, call, timeout):
method_kwargs = {'host_name': host_name,
diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py
index ca6e23fb1..c8b7c680f 100644
--- a/nova/cells/rpcapi.py
+++ b/nova/cells/rpcapi.py
@@ -49,6 +49,7 @@ class CellsAPI(rpc_proxy.RpcProxy):
1.5 - Adds actions_get(), action_get_by_request_id(), and
action_events_get()
1.6 - Adds consoleauth_delete_tokens() and validate_console_port()
+ 1.7 - Adds service_update()
'''
BASE_RPC_API_VERSION = '1.0'
@@ -179,6 +180,21 @@ class CellsAPI(rpc_proxy.RpcProxy):
host_name=host_name),
version='1.2')
+ def service_update(self, ctxt, host_name, binary, params_to_update):
+ """
+ Used to enable/disable a service. For compute services, setting to
+ disabled stops new builds arriving on that host.
+
+ :param host_name: the name of the host machine that the service is
+ running
+ :param binary: The name of the executable that the service runs as
+ :param params_to_update: eg. {'disabled': True}
+ """
+ return self.call(ctxt, self.make_msg(
+ 'service_update', host_name=host_name,
+ binary=binary, params_to_update=params_to_update),
+ version='1.7')
+
def proxy_rpc_to_manager(self, ctxt, rpc_message, topic, call=False,
timeout=None):
"""Proxy RPC to a compute manager. The host in the topic
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1b1a3c506..73d9a652c 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -41,6 +41,7 @@ from nova.compute import utils as compute_utils
from nova.compute import vm_states
from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova import crypto
+from nova import db
from nova.db import base
from nova import exception
from nova import hooks
@@ -2564,6 +2565,14 @@ class HostAPI(base.Base):
"""Get service entry for the given compute hostname."""
return self.db.service_get_by_compute_host(context, host_name)
+ def service_update(self, context, host_name, binary, params_to_update):
+ """
+ Enable / Disable a service.
+ For compute services, this stops new builds and migrations going to
+ the host."""
+ service = db.service_get_by_args(context, host_name, binary)
+ return db.service_update(context, service['id'], params_to_update)
+
def instance_get_all_by_host(self, context, host_name):
"""Return all instances on the given host."""
return self.db.instance_get_all_by_host(context, host_name)
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py
index f5ded45ec..9c0f72c97 100644
--- a/nova/compute/cells_api.py
+++ b/nova/compute/cells_api.py
@@ -603,6 +603,19 @@ class HostAPI(compute_api.HostAPI):
return self.cells_rpcapi.service_get_by_compute_host(context,
host_name)
+ def service_update(self, context, host_name, binary, params_to_update):
+ """
+ Used to enable/disable a service. For compute services, setting to
+ disabled stops new builds arriving on that host.
+
+ :param host_name: the name of the host machine that the service is
+ running
+ :param binary: The name of the executable that the service runs as
+ :param params_to_update: eg. {'disabled': True}
+ """
+ return self.cells_rpcapi.service_update(
+ context, host_name, binary, params_to_update)
+
def instance_get_all_by_host(self, context, host_name):
"""Get all instances by host. Host might have a cell prepended
to it, so we'll need to strip it out. We don't need to proxy
diff --git a/nova/compute/claims.py b/nova/compute/claims.py
index 51717ba18..fc170839f 100644
--- a/nova/compute/claims.py
+++ b/nova/compute/claims.py
@@ -18,11 +18,9 @@ Claim objects for use with resource tracking.
"""
from nova.openstack.common import jsonutils
-from nova.openstack.common import lockutils
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__)
-COMPUTE_RESOURCE_SEMAPHORE = "compute_resources"
class NopClaim(object):
@@ -86,7 +84,6 @@ class Claim(NopClaim):
def vcpus(self):
return self.instance['vcpus']
- @lockutils.synchronized(COMPUTE_RESOURCE_SEMAPHORE, 'nova-')
def abort(self):
"""Compute operation requiring claimed resources has failed or
been aborted.
@@ -210,11 +207,9 @@ class ResizeClaim(Claim):
def vcpus(self):
return self.instance_type['vcpus']
- @lockutils.synchronized(COMPUTE_RESOURCE_SEMAPHORE, 'nova-')
def abort(self):
"""Compute operation requiring claimed resources has failed or
been aborted.
"""
LOG.debug(_("Aborting claim: %s") % self, instance=self.instance)
- self.tracker.abort_resize_claim(self.instance['uuid'],
- self.instance_type)
+ self.tracker.drop_resize_claim(self.instance, self.instance_type)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 7fbe8910e..95ad4f910 100755
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2007,7 +2007,6 @@ class ComputeManager(manager.SchedulerDependentManager):
@exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@reverts_task_state
@wrap_instance_event
- @wrap_instance_fault
def rescue_instance(self, context, instance, rescue_password=None):
"""
Rescue an instance on this host.
@@ -2028,10 +2027,16 @@ class ComputeManager(manager.SchedulerDependentManager):
else:
rescue_image_meta = {}
- with self._error_out_instance_on_exception(context, instance['uuid']):
+ try:
self.driver.rescue(context, instance,
self._legacy_nw_info(network_info),
rescue_image_meta, admin_password)
+ except Exception as e:
+ LOG.exception(_("Error trying to Rescue Instance"),
+ instance=instance)
+ raise exception.InstanceNotRescuable(
+ instance_id=instance['uuid'],
+ reason=_("Driver Error: %s") % unicode(e))
current_power_state = self._get_power_state(context, instance)
self._instance_update(context,
@@ -2125,8 +2130,11 @@ class ComputeManager(manager.SchedulerDependentManager):
self.driver.confirm_migration(migration, instance,
self._legacy_nw_info(network_info))
+ self.conductor_api.migration_update(context, migration,
+ 'confirmed')
+
rt = self._get_resource_tracker(migration['source_node'])
- rt.confirm_resize(context, migration)
+ rt.drop_resize_claim(instance, prefix='old_')
instance = self._instance_update(context, instance['uuid'],
vm_state=vm_states.ACTIVE,
@@ -2178,8 +2186,10 @@ class ComputeManager(manager.SchedulerDependentManager):
self._terminate_volume_connections(context, instance)
+ self.conductor_api.migration_update(context, migration, 'reverted')
+
rt = self._get_resource_tracker(instance.get('node'))
- rt.revert_resize(context, migration, status='reverted_dest')
+ rt.drop_resize_claim(instance)
self.compute_rpcapi.finish_revert_resize(context, instance,
migration, migration['source_compute'],
@@ -2268,9 +2278,6 @@ class ComputeManager(manager.SchedulerDependentManager):
instance = self._instance_update(context, instance['uuid'],
vm_state=vm_states.ACTIVE, task_state=None)
- rt = self._get_resource_tracker(instance.get('node'))
- rt.revert_resize(context, migration)
-
self._notify_about_instance_usage(
context, instance, "resize.revert.end")
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index ab7bf80c5..0ee707922 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -47,7 +47,7 @@ CONF = cfg.CONF
CONF.register_opts(resource_tracker_opts)
LOG = logging.getLogger(__name__)
-COMPUTE_RESOURCE_SEMAPHORE = claims.COMPUTE_RESOURCE_SEMAPHORE
+COMPUTE_RESOURCE_SEMAPHORE = "compute_resources"
class ResourceTracker(object):
@@ -183,6 +183,7 @@ class ResourceTracker(object):
instance_ref['launched_on'] = self.host
instance_ref['node'] = self.nodename
+ @lockutils.synchronized(COMPUTE_RESOURCE_SEMAPHORE, 'nova-')
def abort_instance_claim(self, instance):
"""Remove usage from the given instance."""
# flag the instance as deleted to revert the resource usage
@@ -193,14 +194,20 @@ class ResourceTracker(object):
ctxt = context.get_admin_context()
self._update(ctxt, self.compute_node)
- def abort_resize_claim(self, instance_uuid, instance_type):
- """Remove usage for an incoming migration."""
- if instance_uuid in self.tracked_migrations:
- migration, itype = self.tracked_migrations.pop(instance_uuid)
+ @lockutils.synchronized(COMPUTE_RESOURCE_SEMAPHORE, 'nova-')
+ def drop_resize_claim(self, instance, instance_type=None, prefix='new_'):
+ """Remove usage for an incoming/outgoing migration."""
+ if instance['uuid'] in self.tracked_migrations:
+ migration, itype = self.tracked_migrations.pop(instance['uuid'])
+
+ if not instance_type:
+ ctxt = context.get_admin_context()
+ instance_type = self._get_instance_type(ctxt, instance, prefix)
- if instance_type['id'] == migration['new_instance_type_id']:
+ if instance_type['id'] == itype['id']:
self.stats.update_stats_for_migration(itype, sign=-1)
self._update_usage(self.compute_node, itype, sign=-1)
+ self.compute_node['stats'] = self.stats
ctxt = context.get_admin_context()
self._update(ctxt, self.compute_node)
@@ -353,16 +360,6 @@ class ResourceTracker(object):
self.compute_node = self.conductor_api.compute_node_update(
context, self.compute_node, values, prune_stats)
- def confirm_resize(self, context, migration, status='confirmed'):
- """Cleanup usage for a confirmed resize."""
- elevated = context.elevated()
- self.conductor_api.migration_update(elevated, migration, status)
- self.update_available_resource(elevated)
-
- def revert_resize(self, context, migration, status='reverted'):
- """Cleanup usage for a reverted resize."""
- self.confirm_resize(context, migration, status)
-
def _update_usage(self, resources, usage, sign=1):
resources['memory_mb_used'] += sign * usage['memory_mb']
resources['local_gb_used'] += sign * usage.get('root_gb', 0)
diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py
index 18d75e68c..d959a709b 100644
--- a/nova/consoleauth/manager.py
+++ b/nova/consoleauth/manager.py
@@ -119,7 +119,7 @@ class ConsoleAuthManager(manager.Manager):
def delete_tokens_for_instance(self, context, instance_uuid):
tokens = self._get_tokens_for_instance(instance_uuid)
for token in tokens:
- self.mc.delete(token)
+ self.mc.delete(token.encode('UTF-8'))
self.mc.delete(instance_uuid.encode('UTF-8'))
def get_backdoor_port(self, context):
diff --git a/nova/db/api.py b/nova/db/api.py
index 289dbf1d7..5073ad07e 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1303,6 +1303,24 @@ def instance_type_access_remove(context, flavor_id, project_id):
return IMPL.instance_type_access_remove(context, flavor_id, project_id)
+def instance_type_extra_specs_get(context, flavor_id):
+ """Get all extra specs for an instance type."""
+ return IMPL.instance_type_extra_specs_get(context, flavor_id)
+
+
+def instance_type_extra_specs_delete(context, flavor_id, key):
+ """Delete the given extra specs item."""
+ IMPL.instance_type_extra_specs_delete(context, flavor_id, key)
+
+
+def instance_type_extra_specs_update_or_create(context, flavor_id,
+ extra_specs):
+ """Create or update instance type extra specs. This adds or modifies the
+ key/value pairs specified in the extra specs dict argument"""
+ IMPL.instance_type_extra_specs_update_or_create(context, flavor_id,
+ extra_specs)
+
+
####################
@@ -1429,27 +1447,6 @@ def bw_usage_update(context, uuid, mac, start_period, bw_in, bw_out,
return rv
-####################
-
-
-def instance_type_extra_specs_get(context, flavor_id):
- """Get all extra specs for an instance type."""
- return IMPL.instance_type_extra_specs_get(context, flavor_id)
-
-
-def instance_type_extra_specs_delete(context, flavor_id, key):
- """Delete the given extra specs item."""
- IMPL.instance_type_extra_specs_delete(context, flavor_id, key)
-
-
-def instance_type_extra_specs_update_or_create(context, flavor_id,
- extra_specs):
- """Create or update instance type extra specs. This adds or modifies the
- key/value pairs specified in the extra specs dict argument"""
- IMPL.instance_type_extra_specs_update_or_create(context, flavor_id,
- extra_specs)
-
-
###################
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index e9486ca22..f22a95066 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3816,6 +3816,83 @@ def instance_type_access_remove(context, flavor_id, project_id):
project_id=project_id)
+def _instance_type_extra_specs_get_query(context, flavor_id,
+ session=None):
+ # Two queries necessary because join with update doesn't work.
+ t = model_query(context, models.InstanceTypes.id,
+ base_model=models.InstanceTypes, session=session,
+ read_deleted="no").\
+ filter(models.InstanceTypes.flavorid == flavor_id).\
+ subquery()
+ return model_query(context, models.InstanceTypeExtraSpecs,
+ session=session, read_deleted="no").\
+ filter(models.InstanceTypeExtraSpecs.
+ instance_type_id.in_(t))
+
+
+@require_context
+def instance_type_extra_specs_get(context, flavor_id):
+ rows = _instance_type_extra_specs_get_query(
+ context, flavor_id).\
+ all()
+
+ result = {}
+ for row in rows:
+ result[row['key']] = row['value']
+
+ return result
+
+
+@require_context
+def instance_type_extra_specs_delete(context, flavor_id, key):
+ # Don't need synchronize the session since we will not use the query result
+ _instance_type_extra_specs_get_query(
+ context, flavor_id).\
+ filter(models.InstanceTypeExtraSpecs.key == key).\
+ soft_delete(synchronize_session=False)
+
+
+@require_context
+def instance_type_extra_specs_update_or_create(context, flavor_id, specs):
+ # NOTE(boris-42): There is a race condition in this method. We should add
+ # UniqueConstraint on (instance_type_id, key, deleted) to
+ # avoid duplicated instance_type_extra_specs. This will be
+ # possible after bp/db-unique-keys implementation.
+ session = get_session()
+ with session.begin():
+ instance_type_id = model_query(context, models.InstanceTypes.id,
+ base_model=models.InstanceTypes,
+ session=session, read_deleted="no").\
+ filter(models.InstanceTypes.flavorid == flavor_id).\
+ first()
+ if not instance_type_id:
+ raise exception.FlavorNotFound(flavor_id=flavor_id)
+
+ instance_type_id = instance_type_id.id
+
+ spec_refs = model_query(context, models.InstanceTypeExtraSpecs,
+ session=session, read_deleted="no").\
+ filter_by(instance_type_id=instance_type_id).\
+ filter(models.InstanceTypeExtraSpecs.key.in_(specs.keys())).\
+ all()
+
+ existing_keys = set()
+ for spec_ref in spec_refs:
+ key = spec_ref["key"]
+ existing_keys.add(key)
+ spec_ref.update({"value": specs[key]})
+
+ for key, value in specs.iteritems():
+ if key in existing_keys:
+ continue
+ spec_ref = models.InstanceTypeExtraSpecs()
+ spec_ref.update({"key": key, "value": value,
+ "instance_type_id": instance_type_id})
+ session.add(spec_ref)
+
+ return specs
+
+
####################
@@ -4176,86 +4253,6 @@ def bw_usage_update(context, uuid, mac, start_period, bw_in, bw_out,
####################
-def _instance_type_extra_specs_get_query(context, flavor_id,
- session=None):
- # Two queries necessary because join with update doesn't work.
- t = model_query(context, models.InstanceTypes.id,
- base_model=models.InstanceTypes, session=session,
- read_deleted="no").\
- filter(models.InstanceTypes.flavorid == flavor_id).\
- subquery()
- return model_query(context, models.InstanceTypeExtraSpecs,
- session=session, read_deleted="no").\
- filter(models.InstanceTypeExtraSpecs.
- instance_type_id.in_(t))
-
-
-@require_context
-def instance_type_extra_specs_get(context, flavor_id):
- rows = _instance_type_extra_specs_get_query(
- context, flavor_id).\
- all()
-
- result = {}
- for row in rows:
- result[row['key']] = row['value']
-
- return result
-
-
-@require_context
-def instance_type_extra_specs_delete(context, flavor_id, key):
- # Don't need synchronize the session since we will not use the query result
- _instance_type_extra_specs_get_query(
- context, flavor_id).\
- filter(models.InstanceTypeExtraSpecs.key == key).\
- soft_delete(synchronize_session=False)
-
-
-@require_context
-def instance_type_extra_specs_update_or_create(context, flavor_id, specs):
- # NOTE(boris-42): There is a race condition in this method. We should add
- # UniqueConstraint on (instance_type_id, key, deleted) to
- # avoid duplicated instance_type_extra_specs. This will be
- # possible after bp/db-unique-keys implementation.
- session = get_session()
- with session.begin():
- instance_type_id = model_query(context, models.InstanceTypes.id,
- base_model=models.InstanceTypes,
- session=session, read_deleted="no").\
- filter(models.InstanceTypes.flavorid == flavor_id).\
- first()
- if not instance_type_id:
- raise exception.FlavorNotFound(flavor_id=flavor_id)
-
- instance_type_id = instance_type_id.id
-
- spec_refs = model_query(context, models.InstanceTypeExtraSpecs,
- session=session, read_deleted="no").\
- filter_by(instance_type_id=instance_type_id).\
- filter(models.InstanceTypeExtraSpecs.key.in_(specs.keys())).\
- all()
-
- existing_keys = set()
- for spec_ref in spec_refs:
- key = spec_ref["key"]
- existing_keys.add(key)
- spec_ref.update({"value": specs[key]})
-
- for key, value in specs.iteritems():
- if key in existing_keys:
- continue
- spec_ref = models.InstanceTypeExtraSpecs()
- spec_ref.update({"key": key, "value": value,
- "instance_type_id": instance_type_id})
- session.add(spec_ref)
-
- return specs
-
-
-####################
-
-
@require_context
def vol_get_usage_by_time(context, begin):
"""Return volumes usage that have been updated after a specified time."""
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 5a01e48fc..c6001f5e2 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-01-19 20:22+0000\n"
"Last-Translator: yazar <zrncescientiae@gmail.com>\n"
"Language-Team: Bosnian <bs@li.org>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4234,7 +4234,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4256,7 +4256,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4345,8 +4345,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4382,384 +4382,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4873,7 +4882,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4884,7 +4893,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4978,33 +4987,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5723,7 +5732,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5836,47 +5845,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6053,143 +6062,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6586,15 +6595,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6661,34 +6670,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7112,15 +7121,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7602,7 +7611,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7829,12 +7838,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8514,28 +8523,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8788,6 +8797,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9576,7 +9624,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9734,19 +9782,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10223,160 +10271,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10384,55 +10432,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10496,135 +10544,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10752,16 +10800,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 97fc1964a..abf5dc0ce 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-05-17 20:04+0000\n"
"Last-Translator: Zbyněk Schwarz <Unknown>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -3412,7 +3412,7 @@ msgstr "Vytvořit snímek ze svazku %s"
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4399,7 +4399,7 @@ msgstr "Nastavování bdm %s"
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4423,7 +4423,7 @@ msgstr "Chyba DB: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4517,8 +4517,8 @@ msgstr "ukončování bdm %s"
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Nastavování stavu vm instance na ERROR"
@@ -4556,7 +4556,7 @@ msgstr "Vytvořit snímek ze svazku %s"
msgid "Rebooting instance"
msgstr "Restartování instance %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4565,22 +4565,22 @@ msgstr ""
"pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
"%(state)s očekáváno: %(running)s)"
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "instance %s: znovu zavedena"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: pořizování snímku"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4589,47 +4589,47 @@ msgstr ""
"pokus o vytvoření snímku z nespuštěné instance: %(instance_uuid)s (stav: "
"%(state)s očekáváno: %(running)s)"
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Nalezeno %(num_images)d obrazů (střídání: %(rotation)d)"
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr "Střídání %d záloh"
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "Mazání obrazu %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
#, fuzzy
msgid "Root password set"
msgstr "Instance %s: Nastavení hesla root"
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
#, fuzzy
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr "set_admin_password není tímto ovladačem zavedeno"
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password není tímto ovladačem zavedeno"
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
#, fuzzy
msgid "error setting admin password"
msgstr "Chyba při nastavování hesla správce"
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, fuzzy, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -4638,169 +4638,179 @@ msgstr ""
"pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
"%(current_power_state)s očekáváno: %(expected_state)s)"
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Vkládání cesty souboru: '%s'"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Nelze pozastavit instanci"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Chyba DB: %s"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: rušení záchrany"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Instance nemá svazek."
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr "cíl stejný jako zdroj!"
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
#, fuzzy
msgid "Pausing"
msgstr "Aktualizování!"
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: získávání diagnostik"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "Reset sítě"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "instance %s: vkládání informací o síti"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr "network_info vkládá: |%s|"
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Získat výstup konzole pro instanci %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "instance %s: získávání konzole vnc"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "instance %s: získávání konzole vnc"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, fuzzy, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "Odpojování svazku %(volume_id)s z bodu připojení %(mp)s"
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Odpojování svazku z neznámé instance %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, fuzzy, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr "přidělování sítě pro instanci %s"
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "Síť %(network_id)s nemohla být nalezena."
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Hostitel %(host)s nemohl být nalezen."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "Přesun před spuštěním selhal na %(dest)s"
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "zahájen přesun po spuštění."
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "Přesun instance do %(dest)s úspěšně dokončen."
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -4808,16 +4818,16 @@ msgstr ""
"Můžete vidět tuto chybu \"libvirt: QEMU error: Domain not found: no "
"domain with matching name.\" Tuto chybu můžete bezpečně ignorovat."
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
#, fuzzy
msgid "Post operation of migration started"
msgstr "Spuštěna operace po migraci"
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -4826,64 +4836,64 @@ msgstr ""
"Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
"%(confirm_window)d vteřin"
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "Vypínání VM pro instanci %(instance_uuid)s"
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_id)s nenalezena"
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
#, fuzzy
msgid "In ERROR state"
msgstr "Uzel je v neznámém chybovém stavu."
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr "Aktualizace mezipaměti využití šířky pásma"
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Aktualizace mezipaměti využití šířky pásma"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr "Aktualizace stavu hostitele"
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4892,67 +4902,67 @@ msgstr ""
"Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
"hypervizoru."
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instance není zapnuta"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
#, fuzzy
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr "Znovu získávání smazané instance"
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Zaznamování ovladače svazku: %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, fuzzy, python-format
msgid "No service record for host %s"
msgstr "Žádná služba pro ID výpočtu %s"
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, fuzzy, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -4961,7 +4971,7 @@ msgstr ""
"Zjištěna instance se jmenovkou '%(name_label)s', která je označena jako "
"SMAZÁNA, ale stále je přítomna na hostiteli."
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, fuzzy, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -4970,7 +4980,7 @@ msgstr ""
"Ničení instance se jmenovkou '%(name_label)s', která je označena jako "
"SMAZÁNA, ale stále je přítomna na hostiteli."
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, fuzzy, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -5088,7 +5098,7 @@ msgstr "Nelze najít hostitele pro instanci %s"
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -5099,7 +5109,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
#, fuzzy
msgid "Invalid block_device_mapping_destroy invocation"
msgstr "block_device_mapping %s"
@@ -5198,33 +5208,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Nelze restartovat instanci"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr "Nerozpoznaná hodnota read_deleted '%s'"
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "instance %s: zachráněna"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5971,7 +5981,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr "zařízení záznamu systému musí být jedno z: %s"
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, fuzzy, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
@@ -6084,47 +6094,47 @@ msgstr ""
msgid "received %s"
msgstr "obdrženo: %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "pro zprávu není metoda: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Pro zprávu není metoda: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, fuzzy, python-format
msgid "Making synchronous call on %s ..."
msgstr "Provádění asynchronního volání na %s ..."
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID je %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr "Provádění asynchronního obsazení na %s ..."
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr "Provádění asynchronního obsazení rozvětvení..."
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6308,150 +6318,150 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "rozbalený kontext: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instance %s: přerušování"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "Rušení registrace VM %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
#, fuzzy
msgid "In reactor registered"
msgstr "Není registrováno žádné VM"
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Vytváření snímku instance VM %s "
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Odstraňování základního souboru: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "Nelze odstranit kontejner: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, fuzzy, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr "Zadaná data: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
#, fuzzy
msgid "Creating payload"
msgstr "Vytváření obrazu"
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instance %s: přerušování"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "obdrženo: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "Požadavek je neplatný."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, fuzzy, python-format
msgid "Sending message(s) to: %s"
msgstr "Odstraňování základního souboru: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6854,15 +6864,15 @@ msgstr "Odpověď na předstíraný příkaz je stdout='%(stdout)s' stderr='%(st
msgid "status must be available"
msgstr "stav musí být dostupný"
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr "již připojeno"
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr "již odpojeno"
@@ -6933,34 +6943,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Spouštění instancí: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "Po ukončení instancí: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "Vnitřní chyba"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr "Po vynuceném ukončení instancí: %s"
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7394,15 +7404,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7890,7 +7900,7 @@ msgstr "Verze agenta instance: %s"
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr "Aktualizace statistik hostitele"
@@ -8128,12 +8138,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Vytváření adresáře s cestou %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Vytváření adresáře s cestou %s"
@@ -8859,32 +8869,32 @@ msgstr "přeskakování %(path)s protože vypadá jako svazek"
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
#, fuzzy
msgid "Starting migrate_disk_and_power_off"
msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
#, fuzzy
msgid "Instance running successfully."
msgstr "Instance %s úspěšně běží."
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
#, fuzzy
msgid "Starting finish_migration"
msgstr "Instance %s: Spouštění dokončení přesunu"
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
#, fuzzy
msgid "Starting finish_revert_migration"
msgstr "Instance %s: Spuštění dokočení vrácení přesunu"
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, fuzzy, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr "Mazání souborů instance %(target)s"
@@ -9148,6 +9158,45 @@ msgstr "Zajišťování mostu %s"
msgid "Failed while unplugging vif"
msgstr "Nelze při odpojení vif instance '%s'"
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -10006,7 +10055,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -10174,14 +10223,14 @@ msgstr "Nelze najít svazek v db"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Bod připojení %(mountpoint)s odpojen od instance %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, fuzzy, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
"ČASOVÝ LIMIT: Vypršel čas volání %(method)s. VM id=%(instance_uuid)s; "
"arg=%(args)r"
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10190,7 +10239,7 @@ msgstr ""
"NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
"id=%(instance_uuid)s; arg=%(args)r"
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "Volání %(method)s vrátilo chybu: %(e)s."
@@ -10692,22 +10741,22 @@ msgstr "Neznámý formát obrazu %(disk_image_type)s"
msgid "VDI %s is still available"
msgstr "VDI %s je stále dostupné"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Znovu skenování SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr "Příznak sr_matching_filter '%s' se neřídí pravidly formátování"
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
@@ -10716,50 +10765,50 @@ msgstr ""
"XenAPI nelze najít úložiště na které nainstalovat instance hostů. Prosím "
"zkontrolujte Vaše nastavení a/nebo nastavte příznak 'sr_matching_filter'"
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr "Nelze najít SR typu obsahu ISO"
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr "ISO: hledání SR %(sr_rec)s"
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr "ISO: není obsah iso"
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr "ISO: typ obsahu iso, není klíč 'i18n-key'"
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr "ISO: typ obsahu iso, hodnota i18n-key není 'local-storage-iso'"
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr "ISO: SR odpovídající naším kritériím"
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr "ISO: ISO, prozkoumáváno, zdali se jedná o místního hostitele"
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr "ISO: PBD %(pbd_ref)s zmizelo"
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr "ISO: shoda PBD, požadováno %(pbd_rec)s, získáno %(host)s"
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr "ISO: SR s místním PBD"
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -10768,22 +10817,22 @@ msgstr ""
"Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
"%(server)s."
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr "Neznámá data statistik od Xenserver: %s"
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s má nadřazenho %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
@@ -10792,66 +10841,66 @@ msgstr ""
"Nadřazený %(parent_uuid)s se neshoduje s původním nadřazeným "
"%(original_parent_uuid)s, čekání na splynutí..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr "Překročeny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr "Vypršel časový limit při čekání na vytvoření zařízení %s"
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Zapojování VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Zapojování VBD %s hotovo."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr "VBD %(vbd_ref)s zapojeno jako %(orig_dev)s"
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr "VBD %(vbd_ref)s zapojeno do špatného dev, znovu mapování do %(dev)s"
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Ničení VBD pro VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Ničení VBD pro VDI %s hotovo."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Spouštění pygrub s %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Nalezen kernel Xen %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10859,16 +10908,16 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr "Oddíly:"
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr " %(num)s: %(ptype)s %(size)d sektorů"
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
@@ -10877,39 +10926,39 @@ msgstr ""
"Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
"%(dev_path)s..."
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Zapisování tabulky oddílů %s dokončeno."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr "Přímé zacházení se soubory rozhraní"
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr "Nelze připojit souborový systém (očekáváno v nelinuxových instancích): %s"
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, fuzzy, python-format
msgid "Updating progress to %(progress)d"
msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
@@ -10979,148 +11028,148 @@ msgstr "Verze agenta instance: %s"
msgid "Setting VCPU weight"
msgstr "Nastavování váhy VCPU"
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, fuzzy, python-format
msgid "Could not find VM with name %s"
msgstr "Nelze najít odkaz na VDI"
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "Dokončen snímek a nahrání na VM %s"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr "Nelze převést vhd na nového hostitele"
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, fuzzy, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Zmenšení velikosti VDI %(cow_uuid)s z %(old_gb)d GB na %(new_gb)d GB"
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
#, fuzzy
msgid "Resize complete"
msgstr "Změna velikosti %s je hotova"
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "Neůze najít vbd pro vdi %s"
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "Restartování xvp"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
"Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
"kernelu a ramdisku"
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "soubory kernel/ramdisk odstraněny"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "Restartování xvp"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr "VM není přítomno, přeskakování ničení..."
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Instance již je v záchranném režimu: %s"
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
#, fuzzy
msgid "VM is not present, skipping soft delete..."
msgstr "VM není přítomno, přeskakování ničení..."
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "Automatický tvrdý restart %d"
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "Vkládání informací o síti do xs pro vm: |%s|"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
#, fuzzy
msgid "Creating vifs"
msgstr "Vytváření obrazu"
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
#, fuzzy
msgid "Injecting hostname to xenstore"
msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
#, fuzzy
msgid "Migrate Send failed"
msgstr "Vytvoření selhalo"
@@ -11251,17 +11300,11 @@ msgstr "Spouštění uzlu nova-xvpvncproxy (verze %s)"
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
#, fuzzy
msgid "status must be 'available'"
msgstr "stav musí být dostupný"
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr "Chyba v confirm-resize %s"
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr "Chyba v revert-resize %s"
-
-#~ msgid "Error in reboot %s"
-#~ msgstr "Chyba v restartu %s"
+#~ msgid "Invalid value '%s' for force. "
+#~ msgstr ""
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 06802a0b6..f0af6dd03 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-01-15 21:46+0000\n"
"Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4234,7 +4234,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4256,7 +4256,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4345,8 +4345,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4382,384 +4382,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4873,7 +4882,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4884,7 +4893,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4978,33 +4987,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5723,7 +5732,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5836,47 +5845,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6053,143 +6062,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6586,15 +6595,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6661,34 +6670,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7112,15 +7121,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7602,7 +7611,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7829,12 +7838,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8515,28 +8524,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8789,6 +8798,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9577,7 +9625,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9735,19 +9783,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10224,160 +10272,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10385,55 +10433,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10497,135 +10545,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10753,16 +10801,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index a374366f3..787e4f01e 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-08-23 11:23+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: German <de@li.org>\n"
@@ -3302,7 +3302,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4249,7 +4249,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4271,7 +4271,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4360,8 +4360,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4397,388 +4397,398 @@ msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "Instanz %s: Rettung"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Instanz %s: Rettung"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Nicht möglich volume %s zufinden"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Instanz %s pausiert"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instanz %s: Rettung"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4892,7 +4902,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4903,7 +4913,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4997,33 +5007,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5743,7 +5753,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5856,47 +5866,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "keine Methode für diese Nachricht gefunden: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "keine Methode für diese Nachricht gefunden: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID ist %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6073,143 +6083,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "keine Methode für diese Nachricht gefunden: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6606,15 +6616,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6681,34 +6691,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7137,15 +7147,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7627,7 +7637,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7854,12 +7864,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8542,28 +8552,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8816,6 +8826,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9605,7 +9654,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9765,19 +9814,19 @@ msgstr "Nicht möglich volume %s zufinden"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10254,160 +10303,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10415,55 +10464,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10527,135 +10576,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10784,16 +10833,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 3db613e42..761466266 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-10-21 11:27+0000\n"
"Last-Translator: Tom Fifield <Unknown>\n"
"Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -3328,7 +3328,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4292,7 +4292,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4315,7 +4315,7 @@ msgstr "Caught error: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4405,8 +4405,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4444,397 +4444,407 @@ msgstr "Detach volume %s"
msgid "Rebooting instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Running instances: %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "instance %s: rebooted"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Injecting file path: '%s'"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Going to start terminating instances"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Caught error: %s"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: unrescuing"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: retrieving diagnostics"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "setting network host"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "setting network host"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Get console output for instance %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "Adding console"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "Adding console"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "instance %s: booted"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "instance %s: booted"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Deleting user %s"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: booted"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Deleting user %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4948,7 +4958,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4959,7 +4969,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5054,33 +5064,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "instance %s: rescued"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5807,7 +5817,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5920,47 +5930,47 @@ msgstr ""
msgid "received %s"
msgstr "received %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "no method for message: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "No method for message: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID is %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6137,147 +6147,147 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "unpacked context: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instance %s: suspending"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "De-registering image %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Creating a raw instance"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Starting Bridge interface for %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "Failed to decrypt private key: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instance %s: suspending"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "received %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6675,15 +6685,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6751,34 +6761,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Running instances: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "After terminating instances: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7207,15 +7217,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7703,7 +7713,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7931,12 +7941,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Launching VPN for %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Deleting user %s"
@@ -8631,28 +8641,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8905,6 +8915,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9701,7 +9750,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9861,19 +9910,19 @@ msgstr "Unable to detach volume %s"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10359,94 +10408,94 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "VDI %s is still available"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-scanning SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
@@ -10455,66 +10504,66 @@ msgstr ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Plugging VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Plugging VBD %s done."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Destroying VBD for VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Destroying VBD for VDI %s done."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Running pygrub against %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Found Xen kernel %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "No Xen kernel found. Booting HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10522,55 +10571,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Writing partition table %s done."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10636,139 +10685,139 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "Finished snapshot and upload for VM %s"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "Restarting xvp"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "kernel/ramdisk files removed"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "Restarting xvp"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "setting network host"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10897,16 +10946,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 185235caf..47c667b6d 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-03-30 11:10+0000\n"
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -3313,7 +3313,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4265,7 +4265,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4287,7 +4287,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4377,8 +4377,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4416,392 +4416,402 @@ msgstr "Unable to detach volume %s"
msgid "Rebooting instance"
msgstr "Rebooting instance %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "VBD not found in instance %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Rebooting instance %s"
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: retrieving diagnostics"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "instance %s: reset network"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Get console output for instance %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Instance %(instance_id)s is not running."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_id)s is not running."
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Re-exporting %s volumes"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: snapshotting"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Re-exporting %s volumes"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4915,7 +4925,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4926,7 +4936,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5021,33 +5031,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5768,7 +5778,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5881,47 +5891,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6099,147 +6109,147 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instance %s: suspending"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Get console output for instance %s"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Starting Bridge interface for %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instance %s: suspending"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "Received %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "The request is invalid."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6637,15 +6647,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6712,34 +6722,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7168,15 +7178,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7660,7 +7670,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7888,12 +7898,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Re-exporting %s volumes"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Re-exporting %s volumes"
@@ -8586,28 +8596,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8860,6 +8870,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9653,7 +9702,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9813,19 +9862,19 @@ msgstr "Unable to detach volume %s"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10306,94 +10355,94 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "VDI %s is still available"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-scanning SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
@@ -10402,66 +10451,66 @@ msgstr ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Plugging VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Plugging VBD %s done."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Destroying VBD for VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Destroying VBD for VDI %s done."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Running pygrub against %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Found Xen kernel %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "No Xen kernel found. Booting HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10469,55 +10518,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Writing partition table %s done."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10582,135 +10631,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10839,16 +10888,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index f8a5f486a..0c421b309 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Nova\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2013-01-21 18:28+0000\n"
"Last-Translator: Jeremy Stanley <fungi@yuggoth.org>\n"
"Language-Team: en_US <LL@li.org>\n"
@@ -3397,8 +3397,8 @@ msgid "Create snapshot from volume %s"
msgstr "Create snapshot from volume %s"
#: nova/api/openstack/compute/contrib/volumes.py:620
-#, python-format
-msgid "Invalid value '%s' for force. "
+#, fuzzy, python-format
+msgid "Invalid value '%s' for force."
msgstr "Invalid value '%s' for force. "
#: nova/api/openstack/compute/views/servers.py:186
@@ -4376,7 +4376,7 @@ msgstr "Setting up bdm %s"
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, fuzzy, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr "Memory limit not specified, defaulting to unlimited"
@@ -4399,7 +4399,7 @@ msgstr "DB error: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr "Error trying to reschedule"
@@ -4493,8 +4493,8 @@ msgstr "terminating bdm %s"
msgid "Ignoring volume cleanup failure due to %s"
msgstr "Ignoring volume cleanup failure due to %s"
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Setting instance vm_state to ERROR"
@@ -4530,7 +4530,7 @@ msgstr "Attach boot from volume failed: %s"
msgid "Rebooting instance"
msgstr "Rebooting instance"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4539,21 +4539,21 @@ msgstr ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Cannot reboot instance: %(exc)s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "instance %s: rebooted"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr "instance snapshotting"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4562,45 +4562,45 @@ msgstr ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr "Rotating out %d backups"
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "Deleting image %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Failed to set admin password. Instance %s is not running"
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr "Root password set"
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
#, fuzzy
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr "set_admin_password is not implemented by this driver."
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password failed: %s"
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr "error setting admin password"
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -4609,101 +4609,111 @@ msgstr ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr "injecting file to %(path)s"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr "Rescuing"
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Error trying to reschedule"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "DB error: %s"
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr "Unrescuing"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr "Changing instance metadata according to %(diff)r"
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Instance has no volume."
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr "destination same as source!"
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr "Migrating"
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr "Failed to rollback quota for failed finish_resize: %(qr_error)s"
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr "Pausing"
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr "Unpausing"
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr "Retrieving diagnostics"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr "Resuming"
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr "Reset network"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr "Inject network info"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr "network_info to inject: |%s|"
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr "Get console output"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr "Getting vnc console"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "Getting vnc console"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "Booting with volume %(volume_id)s at %(mountpoint)s"
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
@@ -4712,59 +4722,59 @@ msgstr ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Failed to attach volume %(volume_id)s at %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "Detach volume %(volume_id)s from mountpoint %(mp)s"
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr "Detaching volume from unknown instance"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Faild to detach volume %(volume_id)s from %(mp)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, fuzzy, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr "allocate_for_instance() for %s"
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "Port %(port_id)s is still in use."
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Host %(host)s could not be found."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "Pre live migration failed at %(dest)s"
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr "_post_live_migration() is started.."
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "Migrating instance to %(dest)s finished successfully."
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -4772,15 +4782,15 @@ msgstr ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr "Post operation of migration started"
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr "Updated the info_cache for instance"
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -4789,12 +4799,12 @@ msgstr ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr "Setting migration %(migration_id)s to error: %(reason)s"
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
@@ -4803,26 +4813,26 @@ msgstr ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Instance %(instance_uuid)s not found"
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr "In ERROR state"
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, fuzzy, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr "Error auto-confirming resize: %(e)s. Will retry later."
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -4831,25 +4841,25 @@ msgstr ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr "Failed to generate usage audit for instance on host %s"
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr "Updating bandwidth usage cache"
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Updating bandwidth usage cache"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr "Updating host status"
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4858,11 +4868,11 @@ msgstr ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr "During sync_power_state the instance has a pending task. Skip."
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
@@ -4871,57 +4881,57 @@ msgstr ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr "Instance shutdown by itself. Calling the stop API."
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr "error during stop() in sync_power_state."
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
#, fuzzy
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
#, fuzzy
msgid "Instance is paused unexpectedly. Ignore."
msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr "Instance is not stopped. Calling the stop API."
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr "Instance is not (soft-)deleted."
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
#, fuzzy
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr "Reclaiming deleted instance"
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Loading compute driver '%s'"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr "No service record for host %s"
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -4930,7 +4940,7 @@ msgstr ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -4939,7 +4949,7 @@ msgstr ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, fuzzy, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
@@ -5063,7 +5073,7 @@ msgstr "Unable to find host for Instance %s"
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr "Using %(prefix)s instead of %(req_prefix)s"
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -5074,7 +5084,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
#, fuzzy
msgid "Invalid block_device_mapping_destroy invocation"
msgstr "block_device_mapping %s"
@@ -5173,33 +5183,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Failed to reboot instance"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr "Unrecognized read_deleted value '%s'"
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "instance %s: rescued"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr "Change will make usage less than 0 for the following resources: %(unders)s"
@@ -5951,7 +5961,7 @@ msgstr "Error reading image info file %(filename)s: %(error)s"
msgid "syslog facility must be one of: %s"
msgstr "syslog facility must be one of: %s"
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, fuzzy, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr "Fatal call to deprecated config %(msg)s"
@@ -6066,48 +6076,48 @@ msgstr ""
msgid "received %s"
msgstr "received %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "no method for message: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "No method for message: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
#, fuzzy
msgid "Exception during message handling"
msgstr "Exception during scheduler.run_instance"
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, fuzzy, python-format
msgid "Making synchronous call on %s ..."
msgstr "Making asynchronous call on %s ..."
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID is %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr "Making asynchronous cast on %s..."
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr "Making asynchronous fanout cast..."
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr "Sending %(event_type)s on %(topic)s"
@@ -6291,145 +6301,145 @@ msgstr "You cannot send on this socket."
msgid "Running func with context: %s"
msgstr "Running func with context: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr "Sending reply"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr "Registering reactor"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr "In reactor registered"
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr "Out reactor registered"
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr "Consuming socket"
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr "CONSUMER GOT %s"
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Creating snapshot for instance %s"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr "ROUTER RELAY-OUT SUCCEEDED %(data)s"
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "PowerVM image creation failed: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "Could not remove tmpdir: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr "CONSUMER RECEIVED DATA: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr "ROUTER RELAY-OUT %(data)s"
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr "Consumer is a zmq.%s"
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr "Creating payload"
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr "Creating queue socket for reply waiter"
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr "Sending cast"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr "Cast sent; Waiting reply"
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr "Received message: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr "Unpacking response"
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "The request is invalid."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr "%(msg)s"
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr "Sending message(s) to: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr "No matchmaker results. Not casting."
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6849,15 +6859,15 @@ msgstr "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
msgid "status must be available"
msgstr "status must be available"
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr "already attached"
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr "already detached"
@@ -6929,34 +6939,34 @@ msgstr "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 r
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Running instances: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "After terminating instances: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "Internal error"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr "After force-killing instances: %s"
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7395,15 +7405,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7893,7 +7903,7 @@ msgstr "Windows version: %s "
msgid "get_available_resource called"
msgstr "get_available_resource called"
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr "Updating host stats"
@@ -8129,12 +8139,12 @@ msgstr "Created switch port %(vm_name)s on switch %(ext_path)s"
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Creating directory with path %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Creating directory with path %s"
@@ -8851,28 +8861,28 @@ msgstr "skipping %(path)s since it looks like volume"
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr "Getting disk size of %(i_name)s: %(e)s"
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr "Starting migrate_disk_and_power_off"
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr "Instance running successfully."
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr "Starting finish_migration"
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr "Starting finish_revert_migration"
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, fuzzy, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr "Deleting instance files %(target)s"
@@ -9138,6 +9148,45 @@ msgstr "Ensuring bridge %s"
msgid "Failed while unplugging vif"
msgstr "Failed while unplugging vif"
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9979,7 +10028,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
@@ -10141,12 +10190,12 @@ msgstr "Failed to find volume in db"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10155,7 +10204,7 @@ msgstr ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "The call to %(method)s returned an error: %(e)s. args=%(args)r"
@@ -10661,22 +10710,22 @@ msgstr "Unknown image format %(disk_image_type)s"
msgid "VDI %s is still available"
msgstr "VDI %s is still available"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr "Unable to parse rrd of %(vm_uuid)s"
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-scanning SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr "Flag sr_matching_filter '%s' does not respect formatting convention"
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
@@ -10686,50 +10735,50 @@ msgstr ""
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr "Cannot find SR of content-type ISO"
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr "ISO: looking at SR %(sr_rec)s"
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr "ISO: not iso content"
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr "ISO: iso content_type, no 'i18n-key' key"
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr "ISO: SR MATCHing our criteria"
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr "ISO: ISO, looking to see if it is host local"
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr "ISO: PBD %(pbd_ref)s disappeared"
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr "ISO: SR with local PBD"
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -10738,22 +10787,22 @@ msgstr ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr "Unable to obtain RRD XML updates with server details: %(server)s."
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr "Invalid statistics data from Xenserver: %s"
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
@@ -10762,66 +10811,66 @@ msgstr ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr "Timeout waiting for device %s to be created"
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr "Disconnecting stale VDI %s from compute domU"
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Plugging VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Plugging VBD %s done."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr "VBD %(vbd_ref)s plugged as %(orig_dev)s"
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Destroying VBD for VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Destroying VBD for VDI %s done."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Running pygrub against %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Found Xen kernel %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "No Xen kernel found. Booting HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10829,16 +10878,16 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr "Partitions:"
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr " %(num)s: %(ptype)s %(size)d sectors"
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
@@ -10847,12 +10896,12 @@ msgstr ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Writing partition table %s done."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
@@ -10861,7 +10910,7 @@ msgstr ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
@@ -10870,20 +10919,20 @@ msgstr ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr "Manipulating interface files directly"
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr "Failed to mount filesystem (expected for non-linux instances): %s"
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr "This domU must be running on the host specified by xenapi_connection_url"
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr "Updating progress to %(progress)d"
@@ -10949,122 +10998,122 @@ msgstr "Instance agent version: %s"
msgid "Setting VCPU weight"
msgstr "Setting VCPU weight"
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr "Could not find VM with name %s"
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr "Finished snapshot and upload for VM"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr "Failed to transfer vhd to new host"
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr "Resize complete"
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr "Starting halted instance found during reboot"
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr "Unable to find root VBD/VDI for VM"
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "Destroying VM"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr "Using RAW or VHD, skipping kernel and ramdisk deletion"
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr "instance has a kernel or ramdisk but not both"
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "kernel/ramdisk files removed"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr "Destroying VM"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr "VM is not present, skipping destroy..."
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Instance is already in Rescue Mode: %s"
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
#, fuzzy
msgid "VM is not present, skipping soft delete..."
msgstr "VM is not present, skipping destroy..."
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr "Automatically hard rebooting"
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr "Injecting network info to xenstore"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr "Creating vifs"
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Creating VIF for network %(network_ref)s"
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Created VIF %(vif_ref)s, network %(network_ref)s"
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr "Injecting hostname to xenstore"
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
@@ -11073,15 +11122,15 @@ msgstr ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr "Migrate Receive failed"
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr "VM.assert_can_migratefailed"
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr "Migrate Send failed"
@@ -11211,17 +11260,8 @@ msgstr "Starting nova-xvpvncproxy node (version %s)"
msgid "Cinderclient connection created using URL: %s"
msgstr "Cinderclient connection created using URL: %s"
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
#, fuzzy
msgid "status must be 'available'"
msgstr "status must be available"
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr "Error in confirm-resize %s"
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr "Error in revert-resize %s"
-
-#~ msgid "Error in reboot %s"
-#~ msgstr "Error in reboot %s"
-
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 3e2694685..3a0adf070 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-05-16 06:44+0000\n"
"Last-Translator: Paco Molinero <paco@byasl.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -3341,7 +3341,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4311,7 +4311,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4334,7 +4334,7 @@ msgstr "Capturado error: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4424,8 +4424,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4463,394 +4463,404 @@ msgstr "Desasociar volumen %s"
msgid "Rebooting instance"
msgstr "Reiniciando instancia %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Ejecutando instancias: %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "instancia %s: reiniciada"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instancia %s: creando snapshot"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Fallo al suspender la instancia"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Capturado error: %s"
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "instancia %s: creando snapshot"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instancia %s: obteniendo los diagnosticos"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "configurando la red del host"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "configurando la red del host"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Obtener salida de la consola para la instancia %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Desvinculando volumen de instancia desconocida %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "instancia %s: arrancada"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "La instacia %(instance_id)s no esta suspendida"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "La instacia %(instance_id)s no esta suspendida"
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Borrando usuario %s"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instancia %s: arrancada"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Borrando usuario %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4964,7 +4974,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4975,7 +4985,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5073,33 +5083,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Fallo a reinicia la instancia"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "instancia %s: rescatada"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5824,7 +5834,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5937,47 +5947,47 @@ msgstr ""
msgid "received %s"
msgstr "recibido %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "no hay método para el mensaje: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "No hay método para el mensaje: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID es %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6155,148 +6165,148 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "contenido desempaquetado: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instancia %s: suspendiendo"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "Des-registrando la imagen %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Creando una instancia raw"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Iniciando interfaz puente para %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instancia %s: suspendiendo"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "recibido %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "La petición es inválida."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6696,15 +6706,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6772,34 +6782,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Ejecutando instancias: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "Después de terminar las instancias: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7229,15 +7239,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7722,7 +7732,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7950,12 +7960,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Lanzando VPN para %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Borrando usuario %s"
@@ -8650,28 +8660,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8924,6 +8934,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9722,7 +9771,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9886,19 +9935,19 @@ msgstr ""
"El punto de montaje %(mountpoint)s se desligó de la instancia "
"%(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10384,160 +10433,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "VDI %s está todavía disponible"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-escaneando SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Ejecutando pygrub contra %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Kernel Xen Encontrado %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "Kernel Xen no encontrado. Reiniciando HVM"
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10545,55 +10594,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10659,137 +10708,137 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "Finalizado el snapshot y la subida de la VM %s"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "configurando la red del host"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10918,16 +10967,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 1f0e95d7e..4367d9ed8 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-05-14 08:35+0000\n"
"Last-Translator: Erwan Gallen <Unknown>\n"
"Language-Team: French <fr@li.org>\n"
@@ -3392,7 +3392,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4366,7 +4366,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4389,7 +4389,7 @@ msgstr "Erreur interceptée : %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4479,8 +4479,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4518,397 +4518,407 @@ msgstr "Dé-montage du volume %s"
msgid "Rebooting instance"
msgstr "Redémarrage de l'instance %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Instance actives : %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "instance %s: re-démarrée"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instance %s: création d'un instantané (snapshot)"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "Injection du chemin d'accès : '%s'"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Échec de la suspension de l'instance"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Erreur interceptée : %s"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "instance %s: dé-récupération"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "instance %s: création d'un instantané (snapshot)"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instance %s: récupération des diagnostiques"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "réglage de l'hôte réseau"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "réglage de l'hôte réseau"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Récupération de la sortie de la console de l'instance %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "Ajout de console"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "Ajout de console"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Démontage de volume d'une instance inconnue %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "Le réseau %(network_id)s n'a pas été trouvé."
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "L'hôte %(host)s ne peut pas être trouvé."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Suppression de l'utilisateur %s"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "instance %s: a démarrée"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Suppression de l'utilisateur %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -5023,7 +5033,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -5034,7 +5044,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5132,33 +5142,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Échec du redémarrage de l'instance"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "instance %s: récupérée"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5889,7 +5899,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -6002,47 +6012,47 @@ msgstr ""
msgid "received %s"
msgstr "%s reçu"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "Pas de méthode pour le message : %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Pas de méthode pour le message : %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID est %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6220,148 +6230,148 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "Contexte décompacté : %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instance %s: suspension"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "Dé-enregitrement de l'image %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Création d'une instance raw"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Démarrage de l'interface de Bridge %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "Impossible de déchiffrer la clef privée : %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instance %s: suspension"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "%s reçu"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "La requête est invalide."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6761,15 +6771,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6837,34 +6847,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Instance actives : %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "Après l'arrêt d'instances : %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7294,15 +7304,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7792,7 +7802,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -8020,12 +8030,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Démarrage du VPN pour %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Suppression de l'utilisateur %s"
@@ -8724,28 +8734,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8998,6 +9008,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9797,7 +9846,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9961,19 +10010,19 @@ msgstr ""
"Le point de montage %(mountpoint)s à été détaché de l'instance "
"%(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10461,94 +10510,94 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "Le VDI %s est toujours disponible"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-parcours de SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
@@ -10557,66 +10606,66 @@ msgstr ""
"L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
"%(original_parent_uuid)s, attente de coalesence..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Connexion de VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Connexion de VBD %s terminée."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Destruction de VBD pour la VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Destruction de VBD pour la VDI %s terminée."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Exécution de pygrub sur %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Kernel Xen %s trouvé"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "Pas de kernel Xen trouvé. Démarrage en HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10624,55 +10673,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Ecriture de la table de partitionnement %s terminée."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10739,139 +10788,139 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "Fin de l'instantané et du chargement de VM %s"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "Re-démarrage xvp"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "Fichiers noyau/ramdisk supprimés"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "Re-démarrage xvp"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "réglage de l'hôte réseau"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -11000,16 +11049,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 5a6e780aa..9f6242178 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-04-01 18:59+0000\n"
"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -3312,7 +3312,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4266,7 +4266,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4288,7 +4288,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4378,8 +4378,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4417,390 +4417,400 @@ msgstr "Impossibile smontare il volume %s"
msgid "Rebooting instance"
msgstr "Riavviando l'istanza %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Impossibile montare il volume all'istanza %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Impossibile sospendere l'istanza"
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "istanza %s: ricezione diagnostiche"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "istanza %s: ripristino rete"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Impossibile montare il volume all'istanza %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "istanza %s: sospensione in corso"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "istanza %s: creazione snapshot in corso"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4914,7 +4924,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4925,7 +4935,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5023,33 +5033,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Impossibile riavviare l'istanza"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5771,7 +5781,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5884,47 +5894,47 @@ msgstr ""
msgid "received %s"
msgstr "ricevuto %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "nessun metodo per il messaggio: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "nessun metodo per il messagggio: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID é %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6102,147 +6112,147 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "contesto decompresso: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "istanza %s: sospensione in corso"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Impossibile montare il volume all'istanza %s"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Avviando l'interfaccia Bridge per %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "istanza %s: sospensione in corso"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "ricevuto %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "La richiesta non è valida."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6639,15 +6649,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6714,34 +6724,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7171,15 +7181,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7663,7 +7673,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7890,12 +7900,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8590,28 +8600,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8864,6 +8874,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9655,7 +9704,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9815,19 +9864,19 @@ msgstr "Impossibile smontare il volume %s"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10305,160 +10354,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10466,55 +10515,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10580,135 +10629,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10837,16 +10886,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 17069cbab..e95d8696e 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-08-23 11:22+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: \n"
@@ -3327,7 +3327,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4291,7 +4291,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4314,7 +4314,7 @@ msgstr "エラー %s をキャッチしました。"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4404,8 +4404,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4443,397 +4443,407 @@ msgstr "Detach volume: ボリューム %s をデタッチします"
msgid "Rebooting instance"
msgstr "Rebooting instance: インスタンス %s を再起動します。"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "インスタンス %s は実行中です。"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "インスタンス%s: 再起動しました。"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "ファイルパス '%s' を埋め込んでいます"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "インスタンス終了処理を開始します。"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "エラー %s をキャッチしました。"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "ネットワークホストの設定をします。"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "ネットワークホストの設定をします。"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "コンソールを追加しています"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "コンソールを追加しています"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "インスタンス %s: 起動しました。"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "インスタンス %s: 起動しました。"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Deleting user: ユーザ %s を削除します。"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "インスタンス %s: 起動しました。"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Deleting user: ユーザ %s を削除します。"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4947,7 +4957,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4958,7 +4968,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5053,33 +5063,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "インスタンス %s: rescued"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5804,7 +5814,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5917,47 +5927,47 @@ msgstr ""
msgid "received %s"
msgstr "受信: %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "メッセージ %s に対するメソッドが存在しません。"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "メッセージ %s に対するメソッドが存在しません。"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_IDは %s です。"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6134,147 +6144,147 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "context %s をアンパックしました。"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "suspending: インスタンス %s をサスペンドします。"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "De-registering image: イメージ %s を登録解除します。"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "raw instanceを生成します。"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "%s 用のブリッジインタフェースを開始します。"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "プライベートキーの復号に失敗しました: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "suspending: インスタンス %s をサスペンドします。"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "受信: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6672,15 +6682,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6748,34 +6758,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "インスタンス %s は実行中です。"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "インスタンス %s を終了した後です。"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7204,15 +7214,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7696,7 +7706,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7924,12 +7934,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "%s 用のVPNを起動します。"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Deleting user: ユーザ %s を削除します。"
@@ -8622,28 +8632,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8896,6 +8906,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9692,7 +9741,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9852,19 +9901,19 @@ msgstr "ボリューム %s を切断(detach)できません"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10347,162 +10396,162 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "VDI %s は依然として存在しています。"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "SR %s を再スキャンします。"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s の親は %(parent_ref)s です"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr "親 %(parent_uuid)s が元々の親 %(original_parent_uuid)s と一致しません。作成を待機しています…"
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "VBD %s を接続しています… "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "%s に対して pygrub を実行しています"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Xen Kernel %s が見つかりました。"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
"No Xen kernel found. Booting HVM.\r\n"
"Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10510,55 +10559,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "パーティションテーブル %s の書き込みが完了しました。"
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10624,139 +10673,139 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "VM %s のスナップショットとアップロードが完了しました。"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "xvp を再起動しています"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "カーネル/RAMディスクファイルが削除されました"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "xvp を再起動しています"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "ネットワークホストの設定をします。"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10885,16 +10934,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 147ff5aa7..b158f96a8 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-12-16 04:42+0000\n"
"Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -3301,7 +3301,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4247,7 +4247,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4269,7 +4269,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4358,8 +4358,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4397,388 +4397,398 @@ msgstr "%s 볼륨 탈착에 실패했습니다"
msgid "Rebooting instance"
msgstr "인스턴스 %s를 재부팅합니다"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "인스턴스 %s를 재부팅합니다"
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "인스턴스 %s: 스냅샷 저장중"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4892,7 +4902,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4903,7 +4913,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4997,33 +5007,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5742,7 +5752,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5855,47 +5865,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6072,143 +6082,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6605,15 +6615,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6680,34 +6690,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7136,15 +7146,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7627,7 +7637,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7854,12 +7864,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8548,28 +8558,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8822,6 +8832,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9611,7 +9660,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9771,19 +9820,19 @@ msgstr "%s 볼륨 탈착에 실패했습니다"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10260,160 +10309,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10421,55 +10470,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10534,135 +10583,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10790,16 +10839,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 25294245e..9c126904a 100644
--- a/nova/locale/nb/LC_MESSAGES/nova.po
+++ b/nova/locale/nb/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Nova\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-09-13 10:30+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: nb <LL@li.org>\n"
@@ -3305,7 +3305,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4250,7 +4250,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4272,7 +4272,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4361,8 +4361,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4398,384 +4398,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Nettverk ikke funnet"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4889,7 +4898,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4900,7 +4909,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4994,33 +5003,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5741,7 +5750,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5854,47 +5863,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6071,144 +6080,144 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "Forespørselen er ugyldig."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6606,15 +6615,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6682,34 +6691,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7135,15 +7144,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7625,7 +7634,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7852,12 +7861,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8539,28 +8548,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8813,6 +8822,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9601,7 +9649,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9761,19 +9809,19 @@ msgstr "Kan ikke finne adressen %r"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10251,160 +10299,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10412,55 +10460,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10524,135 +10572,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10780,16 +10828,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 4a2aaecd9..8d66b2967 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: nova jenkins.nova.propose.translation.update.223\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.227\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4234,7 +4234,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4256,7 +4256,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4345,8 +4345,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4382,384 +4382,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4873,7 +4882,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4884,7 +4893,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4978,33 +4987,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5723,7 +5732,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5836,47 +5845,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6053,143 +6062,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6586,15 +6595,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6661,34 +6670,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7112,15 +7121,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7602,7 +7611,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7829,12 +7838,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8514,28 +8523,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8788,6 +8797,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9576,7 +9624,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9734,19 +9782,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10223,160 +10271,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10384,55 +10432,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10496,135 +10544,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10752,7 +10800,7 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 6267bfbee..3ed0ac29c 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-05-04 19:25+0000\n"
"Last-Translator: Júlio Cezar Santos Pires <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -3332,7 +3332,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4296,7 +4296,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4319,7 +4319,7 @@ msgstr "Capturado o erro: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4409,8 +4409,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4448,396 +4448,406 @@ msgstr "Desanexar volume %s"
msgid "Rebooting instance"
msgstr "Reiniciando a instância %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Reconstruindo instância %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "instância %s: fazendo um snapshot"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "Removendo imagem %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
#, fuzzy
msgid "error setting admin password"
msgstr "Configurar senha do administrador"
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Falha ao suspender instância"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Capturado o erro: %s"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "instância %s: desfazendo o resgate"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Instância não existe"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "instância %s: recuperando os diagnósticos"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "instância %s: reset da rede"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Obter saída do console para instância %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "Adicionando console"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "Adicionando console"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Desconectando volume da instância desconhecida %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "Rede %(network_id)s não foi encontrada."
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Host %(host)s não encontrado."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "A instância %(instance_id)s não está executando."
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Remover volume com id: %s"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "Instância %s não encontrada"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Removendo imagem %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4951,7 +4961,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4962,7 +4972,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5059,33 +5069,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Falhou ao reiniciar instância"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "Corpo do pedido está mal formado"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5810,7 +5820,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, fuzzy, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr "Classe %(fullname)s está obsoleta: %(msg)s"
@@ -5923,47 +5933,47 @@ msgstr ""
msgid "received %s"
msgstr "recebido %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "sem método para mensagem: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Sem método para mensagem: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID é %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6140,148 +6150,148 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "conteúdo descompactado: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "instância %s: suspendendo"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "Removendo o registro da imagem %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Obter saída do console para instância %s"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Iniciando a Bridge para %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "instância %s: suspendendo"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "recebido %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "A requisição é inválida."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6679,15 +6689,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6755,34 +6765,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "Erro interno"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7214,15 +7224,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7707,7 +7717,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7935,12 +7945,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Atualizando agente para %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Remover volume com id: %s"
@@ -8639,28 +8649,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8913,6 +8923,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9708,7 +9757,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9868,19 +9917,19 @@ msgstr "Não foi possível criar volume"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10366,160 +10415,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr "O VDI %s continua disponível"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Re-escaneando SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Conectando VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "O VDB %s foi conectado."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Destruindo VBD para o VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "O VBD para o VDI %s foi destruído."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "Rodando pygrub novamente %s"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Kernel Xen encontrado: %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "Kernel Xen não encontrado. Iniciando como HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10576,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, fuzzy, python-format
msgid "Updating progress to %(progress)d"
msgstr "Atualizando agente para %s"
@@ -10641,135 +10690,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10898,16 +10947,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 7997760be..c3220257c 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-03-25 09:34+0000\n"
"Last-Translator: Eugene Marshal <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -3389,7 +3389,7 @@ msgstr "Создать снимок из тома %s"
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4368,7 +4368,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4391,7 +4391,7 @@ msgstr "Ошибка БД: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4485,8 +4485,8 @@ msgstr "завершение работы bdm %s"
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s. Установка состояния копии vm_state на ERROR"
@@ -4524,7 +4524,7 @@ msgstr "Создать снимок из тома %s"
msgid "Rebooting instance"
msgstr "Перезагрузка копии %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4533,22 +4533,22 @@ msgstr ""
"попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
"%(state)s ожидалось: %(running)s)"
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "Обновление сборки %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "копия не включена"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "копия %s: выполнение снимка"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4557,214 +4557,224 @@ msgstr ""
"попытка создания снимка не выполняемой копии: %(instance_uuid)s "
"(состояние: %(state)s ожидалось: %(running)s)"
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "Удаление образа %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
#, fuzzy
msgid "Root password set"
msgstr "Копия %s: Назначение административного пароля"
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
#, fuzzy
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr "set_admin_password не реализован в этой драйвере."
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "set_admin_password не реализован в этой драйвере."
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
#, fuzzy
msgid "error setting admin password"
msgstr "Ошибка назначения пароля администратора"
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Ошибка приостановления копии"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Ошибка БД: %s"
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Копия не существует"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr "назначение совпадает с источником!"
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "копия %s: принятие диагностики"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "Восстановление сети"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "установка сетевого узла"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "Получить консольный вывод для копии %s"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "копия %s: получение консоли vnc"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "копия %s: получение консоли vnc"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "Отсоединение тома от неизвестной копии %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "Попытка удаления несуществующей консоли %(console_id)s."
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, fuzzy, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr "сетевые распределения для копии %s"
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "Сеть %(network_id)s не найдена."
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "Узел %(host)s не найден."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "Запущено post_live_migration().."
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -4773,16 +4783,16 @@ msgstr ""
"отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
"безопасно пропущена."
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
#, fuzzy
msgid "Post operation of migration started"
msgstr "Запущено post_live_migration().."
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
@@ -4791,64 +4801,64 @@ msgstr ""
"Найдены %(migration_count)d неподтверждённых перемещений, старше "
"%(confirm_window)d секунд"
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "Копия %(instance_id)s не найдена"
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
#, fuzzy
msgid "In ERROR state"
msgstr "Ошибка БД: %s"
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr "Обновление временных данных использования полосы пропускания"
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Обновление временных данных использования полосы пропускания"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr "Обновление состояния узла"
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4857,81 +4867,81 @@ msgstr ""
"Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
"гипервизоре."
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "копия не включена"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
#, fuzzy
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "LoggingVolumeDriver: %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, fuzzy, python-format
msgid "No service record for host %s"
msgstr "Нет службы для compute ID %s"
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, fuzzy, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -5049,7 +5059,7 @@ msgstr "Невозможно найти узел для копии %s"
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -5060,7 +5070,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
#, fuzzy
msgid "Invalid block_device_mapping_destroy invocation"
msgstr "block_device_mapping %s"
@@ -5159,33 +5169,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Ошибка перезагрузки копии"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr "Нераспознанное значение read_deleted '%s'"
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "Недопустимый запрос тела"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5928,7 +5938,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, fuzzy, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr "Класс %(fullname)s устарел: %(msg)s"
@@ -6043,47 +6053,47 @@ msgstr ""
msgid "received %s"
msgstr "получено %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "не определен метод для сообщения: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Не определен метод для сообщения: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, fuzzy, python-format
msgid "Making synchronous call on %s ..."
msgstr "Выполнение асинхронного вызова %s ..."
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID is %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6267,150 +6277,150 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "неизвлечённый контекст: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "копия %s: приостановление"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "Исключение регистрации ВМ %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
#, fuzzy
msgid "In reactor registered"
msgstr "Отсутствуют зарегистрированные ВМ"
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "Создание снимка копии ВМ %s "
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "Запуск моста интерфейса для %s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "Ошибка удаления контейнера: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, fuzzy, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr "Заданные данные: %s"
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
#, fuzzy
msgid "Creating payload"
msgstr "Создание изображения"
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "копия %s: приостановление"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "получено %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "Недопустимый запрос."
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, fuzzy, python-format
msgid "Sending message(s) to: %s"
msgstr "Выгрузка образа %s"
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6809,15 +6819,15 @@ msgstr "Ответ на имитацию команды в stdout='%(stdout)s' s
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6886,34 +6896,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Выполняемые копии: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "После завершения работы копий: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr "После принудительного завершения работы копий: %s"
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7344,15 +7354,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7838,7 +7848,7 @@ msgstr "Версия агента копии: %s"
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -8072,12 +8082,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Создание папки с адресом %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Создание папки с адресом %s"
@@ -8785,29 +8795,29 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
#, fuzzy
msgid "Instance running successfully."
msgstr "Копия %s: выполнение"
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -9063,6 +9073,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr "Ошибка отсоединения vif копии '%s'"
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9891,7 +9940,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -10051,14 +10100,14 @@ msgstr "Ошибка поиска тома в базе данных"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, fuzzy, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
"ВРЕМЯ ПРОСТОЯ: Срок вызова %(method)s истёк. VM id=%(instance_uuid)s; "
"args=%(args)r"
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10067,7 +10116,7 @@ msgstr ""
"НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
"id=%(instance_uuid)s; args=%(args)r"
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
@@ -10567,162 +10616,162 @@ msgstr "Неизвестный формат образа %(disk_image_type)s"
msgid "VDI %s is still available"
msgstr "VDI %s до сих пор доступен"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "Повторная проверка SR %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr "Невозможно найти SR типа содержимого ISO"
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr "ISO: поиск SR %(sr_rec)s"
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr "ISO: не содержимое iso типа"
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr "ISO: SR с локальной PBD"
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr "Время ожидания при создании устройства %s"
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "Подсоединение VBD %s ... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "Подсоединение VBD %s выполнено."
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr "VBD %(vbd_ref)s подсоединено как %(orig_dev)s"
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
"VBD %(vbd_ref)s подсоединено в неправильный dev, изменение назначения на "
"%(dev)s"
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "Ликвидирование VBD для VDI %s ... "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "Ликвидирование VBD для VDI %s завершено."
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "Найдено ядро Xen %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "Ядро Xen не найдено. Загрузка HVM."
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10730,16 +10779,16 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr "Разделы:"
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr " %(num)s: %(ptype)s %(size)d секторов"
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
@@ -10748,41 +10797,41 @@ msgstr ""
"Запись таблицы разделов %(primary_first)d %(primary_last)d в "
"%(dev_path)s..."
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "Запись таблицы разделов %s выполнена."
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
"Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
"linux): %s"
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, fuzzy, python-format
msgid "Updating progress to %(progress)d"
msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
@@ -10852,147 +10901,147 @@ msgstr "Версия агента копии: %s"
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, fuzzy, python-format
msgid "Could not find VM with name %s"
msgstr "Невозможно найти конфигурацию по адресу %(path)s"
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "Готовый снимок и выгрузка для ВМ %s"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr "Ошибка перемещения vhd на новый узел"
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, fuzzy, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Изменение размера VDI %(cow_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
#, fuzzy
msgid "Resize complete"
msgstr "Изменение размера копии %s завершено"
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "Ошибка поиска vbd для vdi %s"
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "Выполнение перезагрузки xvp"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
"Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
"ramdisk"
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr "копия содержит ядро или ramdisk, но не оба"
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "файлы ядра/ramdisk удалены"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "Выполнение перезагрузки xvp"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "Копия в состоянии режима восстановления: %s"
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
#, fuzzy
msgid "VM is not present, skipping soft delete..."
msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "Автоматическая безотказная перезагрузка %d"
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "установка сетевого узла"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
#, fuzzy
msgid "Creating vifs"
msgstr "Создание изображения"
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
#, fuzzy
msgid "Migrate Send failed"
msgstr "Ошибка создания"
@@ -11123,17 +11172,11 @@ msgstr "Запуск узла сети nova-xvpvncproxy (версия %s)"
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
#, fuzzy
msgid "status must be 'available'"
msgstr "Образ должен быть доступен"
-#~ msgid "Error in confirm-resize %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
-#~ msgstr "Ошибка при перезагрузке %s"
-
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index c1a3af2fb..011da9707 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-08-23 11:21+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: Tagalog <tl@li.org>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4235,7 +4235,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4257,7 +4257,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4346,8 +4346,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4383,384 +4383,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4874,7 +4883,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4885,7 +4894,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4979,33 +4988,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5724,7 +5733,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5837,47 +5846,47 @@ msgstr ""
msgid "received %s"
msgstr "natanggap %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "walang paraan para sa mensahe: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Walang paraan para sa mensahe: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6054,143 +6063,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "natanggap %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6587,15 +6596,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6662,34 +6671,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7113,15 +7122,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7603,7 +7612,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7830,12 +7839,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8515,28 +8524,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8789,6 +8798,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9577,7 +9625,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9735,19 +9783,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10224,160 +10272,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10385,55 +10433,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10497,135 +10545,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10753,16 +10801,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index f796eed2d..f935fdc09 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-12-14 18:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -3291,7 +3291,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4234,7 +4234,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4256,7 +4256,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4345,8 +4345,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4382,384 +4382,393 @@ msgstr ""
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4873,7 +4882,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4884,7 +4893,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4978,33 +4987,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5723,7 +5732,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5836,47 +5845,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6053,143 +6062,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6586,15 +6595,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6661,34 +6670,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7112,15 +7121,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7602,7 +7611,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7829,12 +7838,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8514,28 +8523,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8788,6 +8797,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9576,7 +9624,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9734,19 +9782,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10223,160 +10271,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10384,55 +10432,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10496,135 +10544,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10752,16 +10800,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 2bb06f122..5783e02fb 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Nova\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2013-02-02 18:03+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: en_US <LL@li.org>\n"
@@ -3357,7 +3357,7 @@ msgstr "%s biriminden sistem görüntüsü oluşturuluyor"
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4317,7 +4317,7 @@ msgstr "%s blok aygıt haritalandırması ayarlanıyor"
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4340,7 +4340,7 @@ msgstr "Veritabanı hatası: %s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4434,8 +4434,8 @@ msgstr "Blok cihazı haritalandırması kapatılıyor %s"
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4471,308 +4471,318 @@ msgstr "Birimi ayır %s"
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "%(num_images)d tane imaj bulundu(dönüş: %(rotation)d)"
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "İmaj siliniyor %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "Yönetici parolası oluşturmada hata. %s örneği çalışmıyor."
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "Örnek kapatmada hata oluştu."
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "Veritabanı hatası: %s"
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "Örneğin hiç bölümü yok."
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr "dedef kaynak ile aynı!"
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "Konsol ekleniyor"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "%(mountpoint)s'de %(volume_id)s bölümü ön yükleniyor"
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "%(mountpoint)s'e %(volume_id)s bölümü bağlanıyor"
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "%(host)s sunucusu bulunamadı."
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "Güncel göç işlemi %(dest)s'da bir hata ile karşılaştı"
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "%(dest)s'a örnek göçü işlemi başarıyla tamamlandı."
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr "Sunucu durumu güncelleniyor"
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4781,79 +4791,79 @@ msgstr ""
"Veritabanında %(num_db_instances)s ve misafir sistemde "
"%(num_vm_instances)s bulundu"
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr "Silinen örnek kurtarılıyor"
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "İmaj siliniyor %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4968,7 +4978,7 @@ msgstr "%s örneği için sunucu bulma başarısız"
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4979,7 +4989,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -5076,33 +5086,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "Tekrar yükleme örneğinde hata oluştu."
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr "Tanınmayan silinmiş okuma değeri '%s'"
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "%s geçerli bir örnek ismidir"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5831,7 +5841,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr "syslog servisi bunlardan biri olmak zorundadır: %s"
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5944,47 +5954,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6161,144 +6171,144 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "İstek geçersiz"
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6698,15 +6708,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6774,34 +6784,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "Örnekler çalışıyor: %s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "Örnekleri sonlandırmanın ardından: %s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "İçsel hata"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr "Zorla öldürülen örneklerin ardından: %s"
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7232,15 +7242,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7723,7 +7733,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7950,12 +7960,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "oluştur: %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8652,28 +8662,28 @@ msgstr "Birim gibi göründüğünden beri %(path)s atlanıyor"
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8928,6 +8938,45 @@ msgstr "%s köprüsü koruma altına alınıyor"
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9717,7 +9766,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9877,19 +9926,19 @@ msgstr "Geçersiz bölüm"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10366,160 +10415,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10576,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10639,136 +10688,136 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "XVP tekar başlatılıyor"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10897,17 +10946,11 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
#, fuzzy
msgid "status must be 'available'"
msgstr "İmaj müsait olmak zorunda"
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr "Yeniden boyutlandırma onayında hata %s"
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr "Yeniden boyutlandırma dönüşünde hata %s"
-
-#~ msgid "Error in reboot %s"
-#~ msgstr "Önyükleme sırasında hata %s"
+#~ msgid "Invalid value '%s' for force. "
+#~ msgstr ""
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index caa245381..3f2197644 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2011-08-23 11:21+0000\n"
"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -3295,7 +3295,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4239,7 +4239,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4261,7 +4261,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4350,8 +4350,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4387,385 +4387,394 @@ msgstr "Від'єднати том %s"
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr ""
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
msgid "Detaching volume from unknown instance"
msgstr ""
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr ""
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "Від'єднати том %s"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "Від'єднати том %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4879,7 +4888,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4890,7 +4899,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4984,33 +4993,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5730,7 +5739,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5843,47 +5852,47 @@ msgstr ""
msgid "received %s"
msgstr "отримано %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "без порядку для повідомлень: %s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "Без порядку для повідомлень: %s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "MSG_ID %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6060,143 +6069,143 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, python-format
msgid "Creating proxy for topic: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
msgid "Topic socket file creation failed."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "отримано %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6593,15 +6602,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6668,34 +6677,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7119,15 +7128,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7609,7 +7618,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7836,12 +7845,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "Від'єднати том %s"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "Від'єднати том %s"
@@ -8521,28 +8530,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8795,6 +8804,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9583,7 +9631,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9741,19 +9789,19 @@ msgstr ""
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr ""
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10230,160 +10278,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10391,55 +10439,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10503,135 +10551,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10760,16 +10808,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 8ba28d3ed..69ceb32ae 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-05-07 06:51+0000\n"
"Last-Translator: Edward <Unknown>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -3376,7 +3376,7 @@ msgstr "为卷 %s 创建快照"
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4353,7 +4353,7 @@ msgstr "正在设置 bdm %s"
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4377,7 +4377,7 @@ msgstr "数据库错误:%s"
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4471,8 +4471,8 @@ msgstr "终止bdm %s"
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr "%s。把实例的 vm_state设置为ERROR"
@@ -4510,76 +4510,76 @@ msgstr "为卷 %s 创建快照"
msgid "Rebooting instance"
msgstr "正在重启虚拟机 %s"
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, fuzzy, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr "试图重启一个没有运行的实例:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)"
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
#, fuzzy
msgid "Instance disappeared during reboot"
msgstr "实例 %s:重启"
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
#, fuzzy
msgid "instance snapshotting"
msgstr "实例 %s: 快照中"
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, fuzzy, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr "试图为一个没有运行的实例快照:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)"
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr "轮换出%d个备份"
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr "正在删除镜像 %s"
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr "设置管理员密码失败。实例 %s 没有运行"
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
#, fuzzy
msgid "Root password set"
msgstr "实例 %s:Root密码已设置"
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
#, fuzzy
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr "该驱动不能执行set_admin_password。"
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, fuzzy, python-format
msgid "set_admin_password failed: %s"
msgstr "该驱动不能执行set_admin_password。"
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
#, fuzzy
msgid "error setting admin password"
msgstr "设置管理员密码出错"
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, fuzzy, python-format
msgid ""
"trying to inject a file into a non-running (state: "
@@ -4588,169 +4588,179 @@ msgstr ""
"试图把一个文件注入到没有运行的实例:%(instance_uuid)s (状态: %(current_power_state)s 预计: "
"%(expected_state)s)"
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, fuzzy, python-format
msgid "injecting file to %(path)s"
msgstr "注入文件路径:'%s'"
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "挂起实例失败"
+
+#: nova/compute/manager.py:2039
+#, fuzzy, python-format
+msgid "Driver Error: %s"
+msgstr "数据库错误:%s"
+
+#: nova/compute/manager.py:2057
#, fuzzy
msgid "Unrescuing"
msgstr "实例 %s:取消救援"
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
#, fuzzy
msgid "Instance has no source host"
msgstr "实例没有卷。"
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr "目标与来源一样。"
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
#, fuzzy
msgid "Pausing"
msgstr "正在更新。"
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
#, fuzzy
msgid "Retrieving diagnostics"
msgstr "实例 %s :获取诊断"
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
#, fuzzy
msgid "Reset network"
msgstr "重置网络"
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
#, fuzzy
msgid "Inject network info"
msgstr "实例 %s:注入网络信息"
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr "将注入的network_info:|%s|"
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
#, fuzzy
msgid "Get console output"
msgstr "获取实例 %s 控制台输出"
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
#, fuzzy
msgid "Getting vnc console"
msgstr "实例 %s:正在获得VNC控制台"
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
#, fuzzy
msgid "Getting spice console"
msgstr "实例 %s:正在获得VNC控制台"
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, fuzzy, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "从未知实例%s中分离卷"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, fuzzy, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr "实例 %s 的网络分配"
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, fuzzy, python-format
msgid "Port %(port_id)s is not attached"
msgstr "网络 %(network_id)s 没有找到。"
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, fuzzy, python-format
msgid "Host %(host)s not found"
msgstr "主机 %(host)s 没有找到。"
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr "预在线迁移在%(dest)s失败"
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
#, fuzzy
msgid "_post_live_migration() is started.."
msgstr "post_live_migration()已经启动。"
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr "把实例迁移到 %(dest)s 成功完成。"
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
@@ -4758,161 +4768,161 @@ msgstr ""
"你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
"name。”这个错误可以放心的忽略。"
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
#, fuzzy
msgid "Post operation of migration started"
msgstr "迁移后操作启动"
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, fuzzy, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, fuzzy, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr "没有找到实例 %(instance_id)s"
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
#, fuzzy
msgid "In ERROR state"
msgstr "节点处于未知的错误状态。"
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr "更新带宽使用缓存"
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
#, fuzzy
msgid "Updating volume usage cache"
msgstr "更新带宽使用缓存"
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr "更新主机状态"
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr "在数据库中找到 %(num_db_instances)s个实例,在虚拟机管理程序找到 %(num_vm_instances)s 个实例。"
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
#, fuzzy
msgid "Instance is not (soft-)deleted."
msgstr "实例未启动"
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
#, fuzzy
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr "FLAGS.reclaim_instance_interval <= 0,跳过..."
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr "回收删除的实例"
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, fuzzy, python-format
msgid "Deleting orphan compute node %s"
msgstr "LoggingVolumeDriver: %s"
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, fuzzy, python-format
msgid "No service record for host %s"
msgstr "计算节点 %s 没有服务"
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, fuzzy, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr "检测标签名为 '%(name_label)s' 的实例,这些实例被标识为DELETED却仍然存在于主机上。"
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, fuzzy, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr "销毁标签名为 '%(name_label)s' 的实例,这些实例被标识为DELETED却仍然存在于主机上。"
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, fuzzy, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
@@ -5028,7 +5038,7 @@ msgstr "无法找到实例 %s 的宿主机"
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -5039,7 +5049,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
#, fuzzy
msgid "Invalid block_device_mapping_destroy invocation"
msgstr "block_device_mapping %s"
@@ -5138,33 +5148,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr "重新启动实例失败"
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr "无法识别的 read_deleted 取值”%s“"
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, fuzzy, python-format
msgid "Invalid instance id %s in request"
msgstr "实例 %s:已救援"
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5896,7 +5906,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr "syslog设备必须作为一个 %s 。"
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, fuzzy, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr "类 %(fullname)s 是不推荐的:%(msg)s"
@@ -6009,47 +6019,47 @@ msgstr ""
msgid "received %s"
msgstr "已接收 %s"
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr "没有适用于消息的方法:%s"
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr "没有适用于消息的方法:%s"
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, fuzzy, python-format
msgid "Making synchronous call on %s ..."
msgstr "在 %s 做异步call"
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr "消息ID(MSG_ID)是 %s"
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr "在 %s 做异步cast"
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr "做异步fanout cast"
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6231,150 +6241,150 @@ msgstr ""
msgid "Running func with context: %s"
msgstr "未打包的上下文:%s"
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
#, fuzzy
msgid "Sending reply"
msgstr "实例 %s:挂起"
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
#, fuzzy
msgid "Registering reactor"
msgstr "正在注销虚拟机 %s"
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
#, fuzzy
msgid "In reactor registered"
msgstr "没有虚拟机注册"
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "正在创建虚拟机实例快照 %s "
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "正在删除基文件:%s"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, fuzzy, python-format
msgid "Could not create IPC directory %s"
msgstr "移除容器失败:%s"
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, fuzzy, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr "给定数据:%s"
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
#, fuzzy
msgid "Creating payload"
msgstr "正在创建镜像"
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
#, fuzzy
msgid "Sending cast"
msgstr "实例 %s:挂起"
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, fuzzy, python-format
msgid "Received message: %s"
msgstr "已接收 %s"
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
#, fuzzy
msgid "RPC Message Invalid."
msgstr "请求无效。"
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, fuzzy, python-format
msgid "Sending message(s) to: %s"
msgstr "正在删除基文件:%s"
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6773,15 +6783,15 @@ msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%
msgid "status must be available"
msgstr "状态必须可用"
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr "已经附加"
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr "已经分离"
@@ -6852,34 +6862,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr "正在运行的实例:%s"
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr "终止实例之后:%s"
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr "内部错误"
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr "强制杀死实例后:%s"
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7313,15 +7323,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7809,7 +7819,7 @@ msgstr "实例代理版本:%s"
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr "正在更新主机状态"
@@ -8047,12 +8057,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, fuzzy, python-format
msgid "Creating directory: %s"
msgstr "正在使用路径 %s 创建目录"
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, fuzzy, python-format
msgid "Removing directory: %s"
msgstr "正在使用路径 %s 创建目录"
@@ -8766,32 +8776,32 @@ msgstr "因它像卷,所以跳过 %(path)s"
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
#, fuzzy
msgid "Starting migrate_disk_and_power_off"
msgstr "实例 %s:开始执行 migrate_disk_and_power_off"
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
#, fuzzy
msgid "Instance running successfully."
msgstr "实例 %s 成功运行。"
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
#, fuzzy
msgid "Starting finish_migration"
msgstr "实例 %s:开始执行 finish_migration"
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
#, fuzzy
msgid "Starting finish_revert_migration"
msgstr "实例 %s:开始执行 finish_revert_migration"
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, fuzzy, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr "删除实例文件 %(target)s"
@@ -9049,6 +9059,45 @@ msgstr "保证桥 %s"
msgid "Failed while unplugging vif"
msgstr "移除实例”%s“的虚拟网络设备时失败"
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9883,7 +9932,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
@@ -10045,19 +10094,19 @@ msgstr "没有在数据库找到卷"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, fuzzy, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr "超时:调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r"
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, fuzzy, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr "没有执行:代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, fuzzy, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr "对 %(method)s 的调用返回错误:%(e)s。"
@@ -10549,160 +10598,160 @@ msgstr "未知的镜像格式 %(disk_image_type)s"
msgid "VDI %s is still available"
msgstr "VDI %s 依然可用"
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr "重新扫描存储库 %s"
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的配置或者配置标记'sr_matching_filter'"
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr "无法找到content-type ISO的存储库"
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr "ISO:正在查看存储库 %(sr_rec)s"
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr "ISO:非iso内容"
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr "ISO:iso content_type,没有 'i18n-key' 键"
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr "ISO:iso content_type,i18n-key的值不是 'local-storage-iso'"
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr "ISO: 存储库符合标准"
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr "ISO: ISO, 正在查看是否是本地的主机"
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr "ISO: PBD %(pbd_ref)s 消失了"
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr "ISO: PBD匹配, 想要 %(pbd_rec)s, 目前有 %(host)s"
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr "ISO:含有本地PBD的存储库"
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML:%(server)s。"
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr "无法获取包含服务器详细情况的RRD XML更新:%(server)s。"
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr "来自Xenserver无效的统计数据:%s"
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, fuzzy, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配,正在等待合并..."
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr "VHD coalesce 将要超过(%(max_attempts)d),放弃中..."
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr "等待设备 %s 创建超时"
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr "插入VBD %s... "
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr "插入VBD %s 完成。"
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr "VBD %(vbd_ref)s 插入错误的设备,重新映射为 %(dev)s"
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr "正在销毁VDI为 %s 的 VBD "
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr "已经销毁VDI为 %s 的 VBD"
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr "对 %s 运行pygrub"
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr "找到Xen内核 %s"
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr "没有找到Xen内核。正在启动HVM。"
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10710,55 +10759,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr "分区:"
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr " %(num)s: %(ptype)s %(size)d sectors"
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr "完成写入分区表 %s 。"
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr "直接操作接口文件"
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr "挂载文件系统失败(期望的是非Linux实例):%s"
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, fuzzy, python-format
msgid "Updating progress to %(progress)d"
msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
@@ -10826,146 +10875,146 @@ msgstr "实例代理版本:%s"
msgid "Setting VCPU weight"
msgstr "设置VCPU 权重"
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, fuzzy, python-format
msgid "Could not find VM with name %s"
msgstr "找不到VDI ref"
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
#, fuzzy
msgid "Finished snapshot and upload for VM"
msgstr "快照完毕并为虚拟机 %s 上传"
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr "将 vhd 转移到新主机失败"
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, fuzzy, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到 %(new_gb)dGB"
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到 %(new_gb)dGB"
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
#, fuzzy
msgid "Resize complete"
msgstr "调整实例 %s 的大小完毕"
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
#, fuzzy
msgid "Unable to find root VBD/VDI for VM"
msgstr "无法为VDI %s 找到VBD"
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
#, fuzzy
msgid "Destroying VDIs"
msgstr "重启xvp"
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
#, fuzzy
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr "实例 %(instance_uuid)s 使用RAW或者VHD,跳过内核和内存盘的删除"
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr "实例拥有内核或者内存盘,但不是二者均有"
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr "内核/内存盘文件移除了"
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
#, fuzzy
msgid "Destroying VM"
msgstr "重启xvp"
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr "虚拟机不存在,跳过销毁..."
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr "实例已处于救援模式:%s"
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
#, fuzzy
msgid "VM is not present, skipping soft delete..."
msgstr "虚拟机不存在,跳过销毁..."
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
#, fuzzy
msgid "Automatically hard rebooting"
msgstr "自动冷重启 %d"
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
#, fuzzy
msgid "Injecting network info to xenstore"
msgstr "为虚拟机注入网络信息到xs:|%s|"
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
#, fuzzy
msgid "Creating vifs"
msgstr "正在创建镜像"
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, fuzzy, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr "正在为虚拟机 %(vm_ref)s,网络 %(network_ref)s 创建VIF。"
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, fuzzy, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr "正在为虚拟机 %(vm_ref)s,网络 %(network_ref)s 创建VIF。"
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
#, fuzzy
msgid "Injecting hostname to xenstore"
msgstr "为虚拟机注入hostname到xs:|%s|"
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
#, fuzzy
msgid "Migrate Send failed"
msgstr "创建失败"
@@ -11096,17 +11145,11 @@ msgstr "启动nova-xvpvncproxy节点(版本 %s)"
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
#, fuzzy
msgid "status must be 'available'"
msgstr "状态必须可用"
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr "confirm-resize中的错误 %s"
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr "revert-resize中的错误 %s"
-
-#~ msgid "Error in reboot %s"
-#~ msgstr "重启中错误 %s"
+#~ msgid "Invalid value '%s' for force. "
+#~ msgstr ""
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 7c91f83a2..a57823017 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nova\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-04-20 00:04+0000\n"
+"POT-Creation-Date: 2013-04-24 00:04+0000\n"
"PO-Revision-Date: 2012-03-07 02:00+0000\n"
"Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -3301,7 +3301,7 @@ msgstr ""
#: nova/api/openstack/compute/contrib/volumes.py:620
#, python-format
-msgid "Invalid value '%s' for force. "
+msgid "Invalid value '%s' for force."
msgstr ""
#: nova/api/openstack/compute/views/servers.py:186
@@ -4247,7 +4247,7 @@ msgstr ""
msgid "Instance disappeared before we could start it"
msgstr ""
-#: nova/compute/manager.py:861 nova/compute/manager.py:2333
+#: nova/compute/manager.py:861 nova/compute/manager.py:2344
#, python-format
msgid "No node specified, defaulting to %(node)s"
msgstr ""
@@ -4269,7 +4269,7 @@ msgstr ""
msgid "Clean up resource before rescheduling."
msgstr ""
-#: nova/compute/manager.py:982 nova/compute/manager.py:2387
+#: nova/compute/manager.py:982 nova/compute/manager.py:2398
msgid "Error trying to reschedule"
msgstr ""
@@ -4358,8 +4358,8 @@ msgstr ""
msgid "Ignoring volume cleanup failure due to %s"
msgstr ""
-#: nova/compute/manager.py:1435 nova/compute/manager.py:2563
-#: nova/compute/manager.py:4057
+#: nova/compute/manager.py:1435 nova/compute/manager.py:2574
+#: nova/compute/manager.py:4067
#, python-format
msgid "%s. Setting instance vm_state to ERROR"
msgstr ""
@@ -4395,385 +4395,395 @@ msgstr "無法卸載 Volume %s"
msgid "Rebooting instance"
msgstr ""
-#: nova/compute/manager.py:1761
+#: nova/compute/manager.py:1767
#, python-format
msgid ""
"trying to reboot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1777
+#: nova/compute/manager.py:1783
#, fuzzy, python-format
msgid "Cannot reboot instance: %(exc)s"
msgstr "無法掛載Volume 到虛擬機器 %s"
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1796
msgid "Instance disappeared during reboot"
msgstr ""
-#: nova/compute/manager.py:1817
+#: nova/compute/manager.py:1823
msgid "instance snapshotting"
msgstr ""
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1829
#, python-format
msgid ""
"trying to snapshot a non-running instance: (state: %(state)s expected: "
"%(running)s)"
msgstr ""
-#: nova/compute/manager.py:1884
+#: nova/compute/manager.py:1890
#, python-format
msgid "Found %(num_images)d images (rotation: %(rotation)d)"
msgstr ""
-#: nova/compute/manager.py:1891
+#: nova/compute/manager.py:1897
#, python-format
msgid "Rotating out %d backups"
msgstr ""
-#: nova/compute/manager.py:1896
+#: nova/compute/manager.py:1902
#, python-format
msgid "Deleting image %s"
msgstr ""
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1930
#, python-format
msgid "Failed to set admin password. Instance %s is not running"
msgstr ""
-#: nova/compute/manager.py:1931
+#: nova/compute/manager.py:1937
msgid "Root password set"
msgstr ""
-#: nova/compute/manager.py:1938
+#: nova/compute/manager.py:1944
msgid "set_admin_password is not implemented by this driver or guest instance."
msgstr ""
-#: nova/compute/manager.py:1953
+#: nova/compute/manager.py:1959
#, python-format
msgid "set_admin_password failed: %s"
msgstr ""
-#: nova/compute/manager.py:1960
+#: nova/compute/manager.py:1966
msgid "error setting admin password"
msgstr ""
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1979
#, python-format
msgid ""
"trying to inject a file into a non-running (state: "
"%(current_power_state)s expected: %(expected_state)s)"
msgstr ""
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:1983
#, python-format
msgid "injecting file to %(path)s"
msgstr ""
-#: nova/compute/manager.py:1997
+#: nova/compute/manager.py:2003
msgid ""
"Unable to find a different image to use for rescue VM, using instance's "
"current image"
msgstr ""
-#: nova/compute/manager.py:2011
+#: nova/compute/manager.py:2016
msgid "Rescuing"
msgstr ""
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2035
+#, fuzzy
+msgid "Error trying to Rescue Instance"
+msgstr "無法掛載Volume 到虛擬機器 %s"
+
+#: nova/compute/manager.py:2039
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2057
msgid "Unrescuing"
msgstr ""
-#: nova/compute/manager.py:2067
+#: nova/compute/manager.py:2078
#, python-format
msgid "Changing instance metadata according to %(diff)r"
msgstr ""
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2302
msgid "Instance has no source host"
msgstr ""
-#: nova/compute/manager.py:2297
+#: nova/compute/manager.py:2308
msgid "destination same as source!"
msgstr ""
-#: nova/compute/manager.py:2314
+#: nova/compute/manager.py:2325
msgid "Migrating"
msgstr ""
-#: nova/compute/manager.py:2560
+#: nova/compute/manager.py:2571
#, python-format
msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
msgstr ""
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2634
msgid "Pausing"
msgstr ""
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2652
msgid "Unpausing"
msgstr ""
-#: nova/compute/manager.py:2679
+#: nova/compute/manager.py:2690
msgid "Retrieving diagnostics"
msgstr ""
-#: nova/compute/manager.py:2710
+#: nova/compute/manager.py:2721
msgid "Resuming"
msgstr ""
-#: nova/compute/manager.py:2730
+#: nova/compute/manager.py:2741
msgid "Reset network"
msgstr ""
-#: nova/compute/manager.py:2735
+#: nova/compute/manager.py:2746
msgid "Inject network info"
msgstr ""
-#: nova/compute/manager.py:2738
+#: nova/compute/manager.py:2749
#, python-format
msgid "network_info to inject: |%s|"
msgstr ""
-#: nova/compute/manager.py:2755
+#: nova/compute/manager.py:2766
msgid "Get console output"
msgstr ""
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2793
msgid "Getting vnc console"
msgstr ""
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2828
msgid "Getting spice console"
msgstr ""
-#: nova/compute/manager.py:2864
+#: nova/compute/manager.py:2875
#, python-format
msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2915
+#: nova/compute/manager.py:2926
#, python-format
msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2935
#, python-format
msgid ""
"Failed to connect to volume %(volume_id)s while attaching at "
"%(mountpoint)s"
msgstr ""
-#: nova/compute/manager.py:2939
+#: nova/compute/manager.py:2950
#, fuzzy, python-format
msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:2969
+#: nova/compute/manager.py:2980
#, python-format
msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
msgstr ""
-#: nova/compute/manager.py:2979
+#: nova/compute/manager.py:2990
#, fuzzy
msgid "Detaching volume from unknown instance"
msgstr "無法掛載Volume 到虛擬機器 %s"
-#: nova/compute/manager.py:2986
+#: nova/compute/manager.py:2997
#, fuzzy, python-format
msgid "Failed to detach volume %(volume_id)s from %(mp)s"
msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
-#: nova/compute/manager.py:3010
+#: nova/compute/manager.py:3021
msgid "Updating volume usage cache with totals"
msgstr ""
-#: nova/compute/manager.py:3048
+#: nova/compute/manager.py:3059
#, python-format
msgid "allocate_port_for_instance returned %(ports)s ports"
msgstr ""
-#: nova/compute/manager.py:3068
+#: nova/compute/manager.py:3079
#, python-format
msgid "Port %(port_id)s is not attached"
msgstr ""
-#: nova/compute/manager.py:3082
+#: nova/compute/manager.py:3093
#, python-format
msgid "Host %(host)s not found"
msgstr ""
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3230
#, python-format
msgid "Pre live migration failed at %(dest)s"
msgstr ""
-#: nova/compute/manager.py:3247
+#: nova/compute/manager.py:3258
msgid "_post_live_migration() is started.."
msgstr ""
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3313
#, python-format
msgid "Migrating instance to %(dest)s finished successfully."
msgstr ""
-#: nova/compute/manager.py:3304
+#: nova/compute/manager.py:3315
msgid ""
"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
"with matching name.\" This error can be safely ignored."
msgstr ""
-#: nova/compute/manager.py:3318
+#: nova/compute/manager.py:3329
msgid "Post operation of migration started"
msgstr ""
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3469
msgid "Updated the info_cache for instance"
msgstr ""
-#: nova/compute/manager.py:3503
+#: nova/compute/manager.py:3514
#, python-format
msgid ""
"Found %(migration_count)d unconfirmed migrations older than "
"%(confirm_window)d seconds"
msgstr ""
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3520
#, python-format
msgid "Setting migration %(migration_id)s to error: %(reason)s"
msgstr ""
-#: nova/compute/manager.py:3518
+#: nova/compute/manager.py:3529
#, python-format
msgid ""
"Automatically confirming migration %(migration_id)s for instance "
"%(instance_uuid)s"
msgstr ""
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3536
#, python-format
msgid "Instance %(instance_uuid)s not found"
msgstr ""
-#: nova/compute/manager.py:3529
+#: nova/compute/manager.py:3540
msgid "In ERROR state"
msgstr ""
-#: nova/compute/manager.py:3536
+#: nova/compute/manager.py:3547
#, python-format
msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
msgstr ""
-#: nova/compute/manager.py:3545
+#: nova/compute/manager.py:3556
#, python-format
msgid "Error auto-confirming resize: %(e)s. Will retry later."
msgstr ""
-#: nova/compute/manager.py:3562
+#: nova/compute/manager.py:3573
#, python-format
msgid ""
"Running instance usage audit for host %(host)s from %(begin_time)s to "
"%(end_time)s. %(number_instances)s instances."
msgstr ""
-#: nova/compute/manager.py:3581
+#: nova/compute/manager.py:3592
#, python-format
msgid "Failed to generate usage audit for instance on host %s"
msgstr ""
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3616
msgid "Updating bandwidth usage cache"
msgstr ""
-#: nova/compute/manager.py:3723
+#: nova/compute/manager.py:3733
msgid "Updating volume usage cache"
msgstr ""
-#: nova/compute/manager.py:3741
+#: nova/compute/manager.py:3750
msgid "Updating host status"
msgstr ""
-#: nova/compute/manager.py:3768
+#: nova/compute/manager.py:3777
#, python-format
msgid ""
"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
"the hypervisor."
msgstr ""
-#: nova/compute/manager.py:3773 nova/compute/manager.py:3822
+#: nova/compute/manager.py:3782 nova/compute/manager.py:3832
msgid "During sync_power_state the instance has a pending task. Skip."
msgstr ""
-#: nova/compute/manager.py:3809
+#: nova/compute/manager.py:3819
#, python-format
msgid ""
"During the sync_power process the instance has moved from host %(src)s to"
" host %(dst)s"
msgstr ""
-#: nova/compute/manager.py:3847
+#: nova/compute/manager.py:3857
msgid "Instance shutdown by itself. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3859 nova/compute/manager.py:3868
-#: nova/compute/manager.py:3898
+#: nova/compute/manager.py:3869 nova/compute/manager.py:3878
+#: nova/compute/manager.py:3908
msgid "error during stop() in sync_power_state."
msgstr ""
-#: nova/compute/manager.py:3863
+#: nova/compute/manager.py:3873
msgid "Instance is suspended unexpectedly. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3879
+#: nova/compute/manager.py:3889
msgid "Instance is paused unexpectedly. Ignore."
msgstr ""
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3895
msgid "Instance is unexpectedly not found. Ignore."
msgstr ""
-#: nova/compute/manager.py:3891
+#: nova/compute/manager.py:3901
msgid "Instance is not stopped. Calling the stop API."
msgstr ""
-#: nova/compute/manager.py:3907
+#: nova/compute/manager.py:3917
msgid "Instance is not (soft-)deleted."
msgstr ""
-#: nova/compute/manager.py:3915
+#: nova/compute/manager.py:3925
msgid "CONF.reclaim_instance_interval <= 0, skipping..."
msgstr ""
-#: nova/compute/manager.py:3935
+#: nova/compute/manager.py:3945
msgid "Reclaiming deleted instance"
msgstr ""
-#: nova/compute/manager.py:3962
+#: nova/compute/manager.py:3972
#, python-format
msgid "Deleting orphan compute node %s"
msgstr ""
-#: nova/compute/manager.py:3972 nova/compute/resource_tracker.py:314
+#: nova/compute/manager.py:3982 nova/compute/resource_tracker.py:314
#, python-format
msgid "No service record for host %s"
msgstr ""
-#: nova/compute/manager.py:4012
+#: nova/compute/manager.py:4022
#, python-format
msgid ""
"Detected instance with name label '%(name)s' which is marked as DELETED "
"but still present on host."
msgstr ""
-#: nova/compute/manager.py:4019
+#: nova/compute/manager.py:4029
#, python-format
msgid ""
"Destroying instance with name label '%(name)s' which is marked as DELETED"
" but still present on host."
msgstr ""
-#: nova/compute/manager.py:4026
+#: nova/compute/manager.py:4036
#, python-format
msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
msgstr ""
@@ -4887,7 +4897,7 @@ msgstr ""
msgid "Using %(prefix)s instead of %(req_prefix)s"
msgstr ""
-#: nova/conductor/api.py:382
+#: nova/conductor/api.py:384
msgid ""
"Timed out waiting for nova-conductor. Is it running? Or did this service "
"start before nova-conductor?"
@@ -4898,7 +4908,7 @@ msgstr ""
msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
msgstr ""
-#: nova/conductor/manager.py:255
+#: nova/conductor/manager.py:257
msgid "Invalid block_device_mapping_destroy invocation"
msgstr ""
@@ -4992,33 +5002,33 @@ msgstr ""
msgid "Failed to notify cells of instance fault"
msgstr ""
-#: nova/db/sqlalchemy/api.py:153
+#: nova/db/sqlalchemy/api.py:154
#, python-format
msgid "Deadlock detected when running '%(func_name)s': Retrying..."
msgstr ""
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:189
msgid "model or base_model parameter should be subclass of NovaBase"
msgstr ""
-#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:202 nova/virt/baremetal/db/sqlalchemy/api.py:61
#, python-format
msgid "Unrecognized read_deleted value '%s'"
msgstr ""
-#: nova/db/sqlalchemy/api.py:1409
+#: nova/db/sqlalchemy/api.py:1410
#, python-format
msgid ""
"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
"empty, \"global\" or \"project\""
msgstr ""
-#: nova/db/sqlalchemy/api.py:1542
+#: nova/db/sqlalchemy/api.py:1545
#, python-format
msgid "Invalid instance id %s in request"
msgstr ""
-#: nova/db/sqlalchemy/api.py:2810
+#: nova/db/sqlalchemy/api.py:2820
#, python-format
msgid "Change will make usage less than 0 for the following resources: %(unders)s"
msgstr ""
@@ -5738,7 +5748,7 @@ msgstr ""
msgid "syslog facility must be one of: %s"
msgstr ""
-#: nova/openstack/common/log.py:540
+#: nova/openstack/common/log.py:537
#, python-format
msgid "Fatal call to deprecated config: %(msg)s"
msgstr ""
@@ -5851,47 +5861,47 @@ msgstr ""
msgid "received %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:413
+#: nova/openstack/common/rpc/amqp.py:414
#, python-format
msgid "no method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:414
+#: nova/openstack/common/rpc/amqp.py:415
#, python-format
msgid "No method for message: %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:440
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
#, python-format
msgid "Expected exception during message handling (%s)"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:448
-#: nova/openstack/common/rpc/impl_zmq.py:291
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
msgid "Exception during message handling"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:583
+#: nova/openstack/common/rpc/amqp.py:586
#, python-format
msgid "Making synchronous call on %s ..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:586
+#: nova/openstack/common/rpc/amqp.py:589
#, python-format
msgid "MSG_ID is %s"
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:620
+#: nova/openstack/common/rpc/amqp.py:623
#, python-format
msgid "Making asynchronous cast on %s..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:629
+#: nova/openstack/common/rpc/amqp.py:632
msgid "Making asynchronous fanout cast..."
msgstr ""
-#: nova/openstack/common/rpc/amqp.py:657
+#: nova/openstack/common/rpc/amqp.py:660
#, python-format
msgid "Sending %(event_type)s on %(topic)s"
msgstr ""
@@ -6069,144 +6079,144 @@ msgstr ""
msgid "Running func with context: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:310
+#: nova/openstack/common/rpc/impl_zmq.py:311
msgid "Sending reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:344
+#: nova/openstack/common/rpc/impl_zmq.py:345
msgid "RPC message did not include method."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:379
+#: nova/openstack/common/rpc/impl_zmq.py:380
msgid "Registering reactor"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:391
+#: nova/openstack/common/rpc/impl_zmq.py:392
msgid "In reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:406
+#: nova/openstack/common/rpc/impl_zmq.py:407
msgid "Out reactor registered"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:410
+#: nova/openstack/common/rpc/impl_zmq.py:411
msgid "Consuming socket"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:452
+#: nova/openstack/common/rpc/impl_zmq.py:453
#, python-format
msgid "CONSUMER GOT %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:464
+#: nova/openstack/common/rpc/impl_zmq.py:465
#, fuzzy, python-format
msgid "Creating proxy for topic: %s"
msgstr "無法掛載Volume 到虛擬機器 %s"
-#: nova/openstack/common/rpc/impl_zmq.py:470
+#: nova/openstack/common/rpc/impl_zmq.py:471
msgid "Topic contained dangerous characters."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:495
+#: nova/openstack/common/rpc/impl_zmq.py:496
#, python-format
msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:505
#, fuzzy
msgid "Topic socket file creation failed."
msgstr "建立虛擬介面失敗"
-#: nova/openstack/common/rpc/impl_zmq.py:509
+#: nova/openstack/common/rpc/impl_zmq.py:510
#, python-format
msgid "ROUTER RELAY-OUT QUEUED %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:512
+#: nova/openstack/common/rpc/impl_zmq.py:513
#, python-format
msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:531
+#: nova/openstack/common/rpc/impl_zmq.py:532
#, python-format
msgid "Could not create IPC directory %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:541
+#: nova/openstack/common/rpc/impl_zmq.py:542
msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:575
+#: nova/openstack/common/rpc/impl_zmq.py:576
#, python-format
msgid "CONSUMER RECEIVED DATA: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:578
#, python-format
msgid "ROUTER RELAY-OUT %(data)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:599
+#: nova/openstack/common/rpc/impl_zmq.py:600
msgid "ZMQ Envelope version unsupported or unknown."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:627
+#: nova/openstack/common/rpc/impl_zmq.py:628
msgid "Skipping topic registration. Already registered."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:634
+#: nova/openstack/common/rpc/impl_zmq.py:635
#, python-format
msgid "Consumer is a zmq.%s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:686
+#: nova/openstack/common/rpc/impl_zmq.py:687
msgid "Creating payload"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:699
+#: nova/openstack/common/rpc/impl_zmq.py:700
msgid "Creating queue socket for reply waiter"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:712
+#: nova/openstack/common/rpc/impl_zmq.py:713
msgid "Sending cast"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:715
+#: nova/openstack/common/rpc/impl_zmq.py:716
msgid "Cast sent; Waiting reply"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:718
+#: nova/openstack/common/rpc/impl_zmq.py:719
#, python-format
msgid "Received message: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:719
+#: nova/openstack/common/rpc/impl_zmq.py:720
msgid "Unpacking response"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:728
+#: nova/openstack/common/rpc/impl_zmq.py:729
msgid "Unsupported or unknown ZMQ envelope returned."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:735
+#: nova/openstack/common/rpc/impl_zmq.py:736
msgid "RPC Message Invalid."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:759
+#: nova/openstack/common/rpc/impl_zmq.py:760
#, python-format
msgid "%(msg)s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:762
+#: nova/openstack/common/rpc/impl_zmq.py:763
#, python-format
msgid "Sending message(s) to: %s"
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:766
+#: nova/openstack/common/rpc/impl_zmq.py:767
msgid "No matchmaker results. Not casting."
msgstr ""
-#: nova/openstack/common/rpc/impl_zmq.py:769
+#: nova/openstack/common/rpc/impl_zmq.py:770
msgid "No match from matchmaker."
msgstr ""
@@ -6603,15 +6613,15 @@ msgstr ""
msgid "status must be available"
msgstr ""
-#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:210
+#: nova/tests/fake_volume.py:190 nova/volume/cinder.py:222
msgid "already attached"
msgstr ""
-#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:214
+#: nova/tests/fake_volume.py:194 nova/volume/cinder.py:226
msgid "Instance and volume not in same availability_zone"
msgstr ""
-#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:220
+#: nova/tests/fake_volume.py:199 nova/volume/cinder.py:232
msgid "already detached"
msgstr ""
@@ -6678,34 +6688,34 @@ msgstr ""
msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
msgstr ""
-#: nova/tests/compute/test_compute.py:985
-#: nova/tests/compute/test_compute.py:1003
-#: nova/tests/compute/test_compute.py:1054
-#: nova/tests/compute/test_compute.py:1081
-#: nova/tests/compute/test_compute.py:1127
-#: nova/tests/compute/test_compute.py:3468
+#: nova/tests/compute/test_compute.py:1044
+#: nova/tests/compute/test_compute.py:1062
+#: nova/tests/compute/test_compute.py:1113
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1186
+#: nova/tests/compute/test_compute.py:3575
#, python-format
msgid "Running instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:991
-#: nova/tests/compute/test_compute.py:1026
-#: nova/tests/compute/test_compute.py:1069
-#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1050
+#: nova/tests/compute/test_compute.py:1085
+#: nova/tests/compute/test_compute.py:1128
+#: nova/tests/compute/test_compute.py:1158
#, python-format
msgid "After terminating instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:1565
+#: nova/tests/compute/test_compute.py:1668
msgid "Internal error"
msgstr ""
-#: nova/tests/compute/test_compute.py:3479
+#: nova/tests/compute/test_compute.py:3586
#, python-format
msgid "After force-killing instances: %s"
msgstr ""
-#: nova/tests/compute/test_compute.py:3980
+#: nova/tests/compute/test_compute.py:4088
msgid "wrong host/node"
msgstr ""
@@ -7134,15 +7144,15 @@ msgstr ""
msgid "no pif for vif_uuid=%s"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:104
+#: nova/virt/baremetal/virtual_power_driver.py:111
msgid "virtual_power_ssh_host not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:108
+#: nova/virt/baremetal/virtual_power_driver.py:115
msgid "virtual_power_host_user not defined. Can not Start"
msgstr ""
-#: nova/virt/baremetal/virtual_power_driver.py:114
+#: nova/virt/baremetal/virtual_power_driver.py:121
msgid "virtual_power_host_pass/key not set. Can not Start"
msgstr ""
@@ -7624,7 +7634,7 @@ msgstr ""
msgid "get_available_resource called"
msgstr ""
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3724
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3726
#: nova/virt/xenapi/host.py:148
msgid "Updating host stats"
msgstr ""
@@ -7851,12 +7861,12 @@ msgstr ""
msgid "The file copy from %(src)s to %(dest)s failed"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:91
+#: nova/virt/hyperv/pathutils.py:92
#, python-format
msgid "Creating directory: %s"
msgstr ""
-#: nova/virt/hyperv/pathutils.py:96 nova/virt/hyperv/snapshotops.py:116
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
#, python-format
msgid "Removing directory: %s"
msgstr ""
@@ -8538,28 +8548,28 @@ msgstr ""
msgid "skipping disk for %(instance_name)s as it does not have a path"
msgstr ""
-#: nova/virt/libvirt/driver.py:3403
+#: nova/virt/libvirt/driver.py:3405
#, python-format
msgid "Getting disk size of %(i_name)s: %(e)s"
msgstr ""
-#: nova/virt/libvirt/driver.py:3449
+#: nova/virt/libvirt/driver.py:3451
msgid "Starting migrate_disk_and_power_off"
msgstr ""
-#: nova/virt/libvirt/driver.py:3508
+#: nova/virt/libvirt/driver.py:3510
msgid "Instance running successfully."
msgstr ""
-#: nova/virt/libvirt/driver.py:3514
+#: nova/virt/libvirt/driver.py:3516
msgid "Starting finish_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3576
+#: nova/virt/libvirt/driver.py:3578
msgid "Starting finish_revert_migration"
msgstr ""
-#: nova/virt/libvirt/driver.py:3697
+#: nova/virt/libvirt/driver.py:3699
#, python-format
msgid "Checking instance files accessability%(instance_path)s"
msgstr ""
@@ -8812,6 +8822,45 @@ msgstr ""
msgid "Failed while unplugging vif"
msgstr ""
+#: nova/virt/libvirt/vif.py:500
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:526
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:554
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:582
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:608
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
#: nova/virt/libvirt/volume.py:237
#, python-format
msgid "iSCSI device not found at %s"
@@ -9603,7 +9652,7 @@ msgstr ""
msgid "Migrated VM to host %s"
msgstr ""
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1327
#, python-format
msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
msgstr ""
@@ -9763,19 +9812,19 @@ msgstr "無法卸載 Volume %s"
msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1564
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1567
#, python-format
msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1568
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1571
#, python-format
msgid ""
"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
"args=%(args)r"
msgstr ""
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1576
#, python-format
msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
msgstr ""
@@ -10252,160 +10301,160 @@ msgstr ""
msgid "VDI %s is still available"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1489
#, python-format
msgid "Unable to parse rrd of %(vm_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1509
+#: nova/virt/xenapi/vm_utils.py:1516
#, python-format
msgid "Re-scanning SR %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1544
#, python-format
msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1555
+#: nova/virt/xenapi/vm_utils.py:1562
msgid ""
"XenAPI is unable to find a Storage Repository to install guest instances "
"on. Please check your configuration and/or configure the flag "
"'sr_matching_filter'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1568
+#: nova/virt/xenapi/vm_utils.py:1575
msgid "Cannot find SR of content-type ISO"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1583
#, python-format
msgid "ISO: looking at SR %(sr_rec)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1578
+#: nova/virt/xenapi/vm_utils.py:1585
msgid "ISO: not iso content"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1581
+#: nova/virt/xenapi/vm_utils.py:1588
msgid "ISO: iso content_type, no 'i18n-key' key"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1584
+#: nova/virt/xenapi/vm_utils.py:1591
msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1588
+#: nova/virt/xenapi/vm_utils.py:1595
msgid "ISO: SR MATCHing our criteria"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1590
+#: nova/virt/xenapi/vm_utils.py:1597
msgid "ISO: ISO, looking to see if it is host local"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1593
+#: nova/virt/xenapi/vm_utils.py:1600
#, python-format
msgid "ISO: PBD %(pbd_ref)s disappeared"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1596
+#: nova/virt/xenapi/vm_utils.py:1603
#, python-format
msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1599
+#: nova/virt/xenapi/vm_utils.py:1606
msgid "ISO: SR with local PBD"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1621
+#: nova/virt/xenapi/vm_utils.py:1628
#, python-format
msgid ""
"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
"%(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1637
+#: nova/virt/xenapi/vm_utils.py:1644
#, python-format
msgid "Unable to obtain RRD XML updates with server details: %(server)s."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1691
+#: nova/virt/xenapi/vm_utils.py:1698
#, python-format
msgid "Invalid statistics data from Xenserver: %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1751
+#: nova/virt/xenapi/vm_utils.py:1758
#, python-format
msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1838
+#: nova/virt/xenapi/vm_utils.py:1845
#, python-format
msgid ""
"Parent %(parent_uuid)s doesn't match original parent "
"%(original_parent_uuid)s, waiting for coalesce..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1848
+#: nova/virt/xenapi/vm_utils.py:1855
#, python-format
msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1883
+#: nova/virt/xenapi/vm_utils.py:1890
#, python-format
msgid "Timeout waiting for device %s to be created"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1903
+#: nova/virt/xenapi/vm_utils.py:1910
#, python-format
msgid "Disconnecting stale VDI %s from compute domU"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1916
+#: nova/virt/xenapi/vm_utils.py:1923
#, python-format
msgid "Plugging VBD %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1919
+#: nova/virt/xenapi/vm_utils.py:1926
#, python-format
msgid "Plugging VBD %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1921
+#: nova/virt/xenapi/vm_utils.py:1928
#, python-format
msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1924
+#: nova/virt/xenapi/vm_utils.py:1931
#, python-format
msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1929
+#: nova/virt/xenapi/vm_utils.py:1936
#, python-format
msgid "Destroying VBD for VDI %s ... "
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1937
+#: nova/virt/xenapi/vm_utils.py:1944
#, python-format
msgid "Destroying VBD for VDI %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1964
+#: nova/virt/xenapi/vm_utils.py:1971
#, python-format
msgid "Running pygrub against %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1972
+#: nova/virt/xenapi/vm_utils.py:1979
#, python-format
msgid "Found Xen kernel %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:1981
msgid "No Xen kernel found. Booting HVM."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1983
msgid ""
"Error while executing pygrub! Please, ensure the binary is installed "
"correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10413,55 +10462,55 @@ msgid ""
"mode."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1993
+#: nova/virt/xenapi/vm_utils.py:2000
msgid "Partitions:"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:1999
+#: nova/virt/xenapi/vm_utils.py:2006
#, python-format
msgid " %(num)s: %(ptype)s %(size)d sectors"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2024
+#: nova/virt/xenapi/vm_utils.py:2031
#, python-format
msgid ""
"Writing partition table %(primary_first)d %(primary_last)d to "
"%(dev_path)s..."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2037
+#: nova/virt/xenapi/vm_utils.py:2044
#, python-format
msgid "Writing partition table %s done."
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2091
+#: nova/virt/xenapi/vm_utils.py:2098
#, python-format
msgid ""
"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
"virtual_size=%(virtual_size)d block_size=%(block_size)d"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2124
+#: nova/virt/xenapi/vm_utils.py:2131
#, python-format
msgid ""
"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
"reduction in size"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2176
+#: nova/virt/xenapi/vm_utils.py:2183
msgid "Manipulating interface files directly"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2185
+#: nova/virt/xenapi/vm_utils.py:2192
#, python-format
msgid "Failed to mount filesystem (expected for non-linux instances): %s"
msgstr ""
-#: nova/virt/xenapi/vm_utils.py:2297
+#: nova/virt/xenapi/vm_utils.py:2304
msgid "This domU must be running on the host specified by xenapi_connection_url"
msgstr ""
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:792
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
#, python-format
msgid "Updating progress to %(progress)d"
msgstr ""
@@ -10525,135 +10574,135 @@ msgstr ""
msgid "Setting VCPU weight"
msgstr ""
-#: nova/virt/xenapi/vmops.py:703
+#: nova/virt/xenapi/vmops.py:706
#, python-format
msgid "Could not find VM with name %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:761
+#: nova/virt/xenapi/vmops.py:764
msgid "Finished snapshot and upload for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:765
+#: nova/virt/xenapi/vmops.py:768
#, python-format
msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
msgstr ""
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:776
msgid "Failed to transfer vhd to new host"
msgstr ""
-#: nova/virt/xenapi/vmops.py:810
+#: nova/virt/xenapi/vmops.py:813
#, python-format
msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:816 nova/virt/xenapi/vmops.py:866
+#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
msgid "Clean shutdown did not complete successfully, trying hard shutdown."
msgstr ""
-#: nova/virt/xenapi/vmops.py:895
+#: nova/virt/xenapi/vmops.py:898
msgid "Resize down not allowed without auto_disk_config"
msgstr ""
-#: nova/virt/xenapi/vmops.py:940
+#: nova/virt/xenapi/vmops.py:943
#, python-format
msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
msgstr ""
-#: nova/virt/xenapi/vmops.py:945
+#: nova/virt/xenapi/vmops.py:948
msgid "Resize complete"
msgstr ""
-#: nova/virt/xenapi/vmops.py:989
+#: nova/virt/xenapi/vmops.py:992
msgid "Starting halted instance found during reboot"
msgstr ""
-#: nova/virt/xenapi/vmops.py:995
+#: nova/virt/xenapi/vmops.py:998
msgid ""
"Reboot failed due to bad volumes, detaching bad volumes and starting "
"halted instance"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1089
+#: nova/virt/xenapi/vmops.py:1092
msgid "Unable to find root VBD/VDI for VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1093
+#: nova/virt/xenapi/vmops.py:1096
msgid "Destroying VDIs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1120
+#: nova/virt/xenapi/vmops.py:1123
msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1127
+#: nova/virt/xenapi/vmops.py:1130
msgid "instance has a kernel or ramdisk but not both"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1134
+#: nova/virt/xenapi/vmops.py:1137
msgid "kernel/ramdisk files removed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1161
+#: nova/virt/xenapi/vmops.py:1164
msgid "Destroying VM"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1190
+#: nova/virt/xenapi/vmops.py:1193
msgid "VM is not present, skipping destroy..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1241
+#: nova/virt/xenapi/vmops.py:1244
#, python-format
msgid "Instance is already in Rescue Mode: %s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1275
+#: nova/virt/xenapi/vmops.py:1278
msgid "VM is not present, skipping soft delete..."
msgstr ""
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1331
msgid "Automatically hard rebooting"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1468
+#: nova/virt/xenapi/vmops.py:1471
msgid "Injecting network info to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1487
+#: nova/virt/xenapi/vmops.py:1490
msgid "Creating vifs"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1499
#, python-format
msgid "Creating VIF for network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1502
#, python-format
msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1530
msgid "Injecting hostname to xenstore"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/vmops.py:1626
#, python-format
msgid ""
"Destination host:%(hostname)s must be in the same aggregate as the source"
" server"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1655
+#: nova/virt/xenapi/vmops.py:1658
msgid "Migrate Receive failed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1706
msgid "VM.assert_can_migratefailed"
msgstr ""
-#: nova/virt/xenapi/vmops.py:1740
+#: nova/virt/xenapi/vmops.py:1743
msgid "Migrate Send failed"
msgstr ""
@@ -10781,16 +10830,10 @@ msgstr ""
msgid "Cinderclient connection created using URL: %s"
msgstr ""
-#: nova/volume/cinder.py:207
+#: nova/volume/cinder.py:219
msgid "status must be 'available'"
msgstr ""
-#~ msgid "Error in confirm-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in revert-resize %s"
-#~ msgstr ""
-
-#~ msgid "Error in reboot %s"
+#~ msgid "Invalid value '%s' for force. "
#~ msgstr ""
diff --git a/nova/openstack/common/loopingcall.py b/nova/openstack/common/loopingcall.py
new file mode 100644
index 000000000..f9ca53003
--- /dev/null
+++ b/nova/openstack/common/loopingcall.py
@@ -0,0 +1,147 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Justin Santa Barbara
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import sys
+
+from eventlet import event
+from eventlet import greenthread
+
+from nova.openstack.common.gettextutils import _
+from nova.openstack.common import log as logging
+from nova.openstack.common import timeutils
+
+LOG = logging.getLogger(__name__)
+
+
+class LoopingCallDone(Exception):
+ """Exception to break out and stop a LoopingCall.
+
+ The poll-function passed to LoopingCall can raise this exception to
+ break out of the loop normally. This is somewhat analogous to
+ StopIteration.
+
+ An optional return-value can be included as the argument to the exception;
+ this return-value will be returned by LoopingCall.wait()
+
+ """
+
+ def __init__(self, retvalue=True):
+ """:param retvalue: Value that LoopingCall.wait() should return."""
+ self.retvalue = retvalue
+
+
+class LoopingCallBase(object):
+ def __init__(self, f=None, *args, **kw):
+ self.args = args
+ self.kw = kw
+ self.f = f
+ self._running = False
+ self.done = None
+
+ def stop(self):
+ self._running = False
+
+ def wait(self):
+ return self.done.wait()
+
+
+class FixedIntervalLoopingCall(LoopingCallBase):
+ """A fixed interval looping call."""
+
+ def start(self, interval, initial_delay=None):
+ self._running = True
+ done = event.Event()
+
+ def _inner():
+ if initial_delay:
+ greenthread.sleep(initial_delay)
+
+ try:
+ while self._running:
+ start = timeutils.utcnow()
+ self.f(*self.args, **self.kw)
+ end = timeutils.utcnow()
+ if not self._running:
+ break
+ delay = interval - timeutils.delta_seconds(start, end)
+ if delay <= 0:
+ LOG.warn(_('task run outlasted interval by %s sec') %
+ -delay)
+ greenthread.sleep(delay if delay > 0 else 0)
+ except LoopingCallDone, e:
+ self.stop()
+ done.send(e.retvalue)
+ except Exception:
+ LOG.exception(_('in fixed duration looping call'))
+ done.send_exception(*sys.exc_info())
+ return
+ else:
+ done.send(True)
+
+ self.done = done
+
+ greenthread.spawn_n(_inner)
+ return self.done
+
+
+# TODO(mikal): this class name is deprecated in Havana and should be removed
+# in the I release
+LoopingCall = FixedIntervalLoopingCall
+
+
+class DynamicLoopingCall(LoopingCallBase):
+ """A looping call which sleeps until the next known event.
+
+ The function called should return how long to sleep for before being
+ called again.
+ """
+
+ def start(self, initial_delay=None, periodic_interval_max=None):
+ self._running = True
+ done = event.Event()
+
+ def _inner():
+ if initial_delay:
+ greenthread.sleep(initial_delay)
+
+ try:
+ while self._running:
+ idle = self.f(*self.args, **self.kw)
+ if not self._running:
+ break
+
+ if periodic_interval_max is not None:
+ idle = min(idle, periodic_interval_max)
+ LOG.debug(_('Dynamic looping call sleeping for %.02f '
+ 'seconds'), idle)
+ greenthread.sleep(idle)
+ except LoopingCallDone, e:
+ self.stop()
+ done.send(e.retvalue)
+ except Exception:
+ LOG.exception(_('in dynamic looping call'))
+ done.send_exception(*sys.exc_info())
+ return
+ else:
+ done.send(True)
+
+ self.done = done
+
+ greenthread.spawn(_inner)
+ return self.done
diff --git a/nova/service.py b/nova/service.py
index 0aa66310a..7cb0e2212 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -37,6 +37,7 @@ from nova import exception
from nova.openstack.common import eventlet_backdoor
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.openstack.common import rpc
from nova import servicegroup
from nova import utils
@@ -473,7 +474,7 @@ class Service(object):
else:
initial_delay = None
- periodic = utils.DynamicLoopingCall(self.periodic_tasks)
+ periodic = loopingcall.DynamicLoopingCall(self.periodic_tasks)
periodic.start(initial_delay=initial_delay,
periodic_interval_max=self.periodic_interval_max)
self.timers.append(periodic)
diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py
index aa29596db..24fcfd04f 100644
--- a/nova/servicegroup/drivers/db.py
+++ b/nova/servicegroup/drivers/db.py
@@ -18,6 +18,7 @@ from oslo.config import cfg
from nova import conductor
from nova import context
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.openstack.common import timeutils
from nova.servicegroup import api
from nova import utils
@@ -46,7 +47,8 @@ class DbDriver(api.ServiceGroupDriver):
' ServiceGroup driver'))
report_interval = service.report_interval
if report_interval:
- pulse = utils.FixedIntervalLoopingCall(self._report_state, service)
+ pulse = loopingcall.FixedIntervalLoopingCall(self._report_state,
+ service)
pulse.start(interval=report_interval,
initial_delay=report_interval)
return pulse
diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py
index 0801138ff..86c27a3aa 100644
--- a/nova/servicegroup/drivers/mc.py
+++ b/nova/servicegroup/drivers/mc.py
@@ -22,10 +22,10 @@ from oslo.config import cfg
from nova import conductor
from nova import context
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.openstack.common import memorycache
from nova.openstack.common import timeutils
from nova.servicegroup import api
-from nova import utils
CONF = cfg.CONF
@@ -58,7 +58,8 @@ class MemcachedDriver(api.ServiceGroupDriver):
'Memcached based ServiceGroup driver'))
report_interval = service.report_interval
if report_interval:
- pulse = utils.FixedIntervalLoopingCall(self._report_state, service)
+ pulse = loopingcall.FixedIntervalLoopingCall(self._report_state,
+ service)
pulse.start(interval=report_interval,
initial_delay=report_interval)
return pulse
diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py
index 4326ef444..55a7097b4 100644
--- a/nova/servicegroup/drivers/zk.py
+++ b/nova/servicegroup/drivers/zk.py
@@ -22,8 +22,8 @@ from oslo.config import cfg
from nova import exception
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.servicegroup import api
-from nova import utils
evzookeeper = importutils.try_import('evzookeeper')
membership = importutils.try_import('evzookeeper.membersip')
@@ -139,7 +139,7 @@ class ZooKeeperDriver(api.ServiceGroupDriver):
return all_members
-class FakeLoopingCall(utils.LoopingCallBase):
+class FakeLoopingCall(loopingcall.LoopingCallBase):
"""The fake Looping Call implementation, created for backward
compatibility with a membership based on DB.
"""
diff --git a/nova/storage/linuxscsi.py b/nova/storage/linuxscsi.py
index 739092b2e..fb093b08a 100644
--- a/nova/storage/linuxscsi.py
+++ b/nova/storage/linuxscsi.py
@@ -18,6 +18,7 @@
from nova import exception
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova import utils
LOG = logging.getLogger(__name__)
@@ -77,12 +78,13 @@ def _wait_for_remove(device, tries):
devices = get_device_list()
if device["device"] not in devices:
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
def remove_device(device):
tries = 0
- timer = utils.FixedIntervalLoopingCall(_wait_for_remove, device, tries)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_remove, device,
+ tries)
timer.start(interval=2).wait()
timer.stop()
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
index 00759a7ef..385d56939 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
@@ -17,6 +17,7 @@
import uuid
from lxml import etree
+import testtools
import webob
from nova.api.openstack.compute.contrib import floating_ips
@@ -281,9 +282,21 @@ class FloatingIpTest(test.TestCase):
self.stubs.Set(network.api.API, "allocate_floating_ip", fake_allocate)
req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips')
- self.assertRaises(exception.NoMoreFloatingIps,
- self.controller.create,
- req)
+ with testtools.ExpectedException(webob.exc.HTTPNotFound,
+ 'No more floating ips'):
+ self.controller.create(req)
+
+ def test_floating_ip_allocate_no_free_ips_pool(self):
+ def fake_allocate(*args, **kwargs):
+ raise exception.NoMoreFloatingIps()
+
+ self.stubs.Set(network.api.API, "allocate_floating_ip", fake_allocate)
+
+ req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips')
+ with testtools.ExpectedException(
+ webob.exc.HTTPNotFound,
+ 'No more floating ips in pool non_existant_pool'):
+ self.controller.create(req, {'pool': 'non_existant_pool'})
def test_floating_ip_allocate(self):
def fake1(*args, **kwargs):
diff --git a/nova/tests/cells/test_cells_manager.py b/nova/tests/cells/test_cells_manager.py
index 74a7e9834..137d48ff6 100644
--- a/nova/tests/cells/test_cells_manager.py
+++ b/nova/tests/cells/test_cells_manager.py
@@ -294,6 +294,26 @@ class CellsManagerClassTestCase(test.TestCase):
host_name=cell_and_host)
self.assertEqual(expected_response, response)
+ def test_service_update(self):
+ fake_cell = 'fake-cell'
+ fake_response = messaging.Response(
+ fake_cell, FAKE_SERVICES[0], False)
+ expected_response = copy.deepcopy(FAKE_SERVICES[0])
+ cells_utils.add_cell_to_service(expected_response, fake_cell)
+ cell_and_host = cells_utils.cell_with_item('fake-cell', 'fake-host')
+ params_to_update = {'disabled': True}
+
+ self.mox.StubOutWithMock(self.msg_runner, 'service_update')
+ self.msg_runner.service_update(self.ctxt,
+ fake_cell, 'fake-host', 'nova-api',
+ params_to_update).AndReturn(fake_response)
+ self.mox.ReplayAll()
+
+ response = self.cells_manager.service_update(
+ self.ctxt, host_name=cell_and_host, binary='nova-api',
+ params_to_update=params_to_update)
+ self.assertEqual(expected_response, response)
+
def test_proxy_rpc_to_manager(self):
self.mox.StubOutWithMock(self.msg_runner,
'proxy_rpc_to_manager')
diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py
index bed27085f..728856006 100644
--- a/nova/tests/cells/test_cells_messaging.py
+++ b/nova/tests/cells/test_cells_messaging.py
@@ -20,6 +20,7 @@ from oslo.config import cfg
from nova.cells import messaging
from nova.cells import utils as cells_utils
from nova import context
+from nova import db
from nova import exception
from nova.openstack.common import rpc
from nova.openstack.common import timeutils
@@ -745,6 +746,42 @@ class CellsTargetedMethodsTestCase(test.TestCase):
result = response.value_or_raise()
self.assertEqual('fake-service', result)
+ def test_service_update(self):
+ binary = 'nova-compute'
+ fake_service = dict(id=42, host='fake_host', binary='nova-compute',
+ topic='compute')
+ fake_compute = dict(
+ id=7116, service_id=42, host='fake_host', vcpus=0, memory_mb=0,
+ local_gb=0, vcpus_used=0, memory_mb_used=0, local_gb_used=0,
+ hypervisor_type=0, hypervisor_version=0, hypervisor_hostname=0,
+ free_ram_mb=0, free_disk_gb=0, current_workload=0, running_vms=0,
+ cpu_info='HAL', disk_available_least=0)
+ params_to_update = {'disabled': True, 'report_count': 13}
+
+ ctxt = context.RequestContext('fake_user', 'fake_project',
+ is_admin=True)
+ # We use the real DB for this test, as it's too hard to reach the
+ # host_api to mock out its DB methods
+ db.service_create(ctxt, fake_service)
+ db.compute_node_create(ctxt, fake_compute)
+
+ self.mox.ReplayAll()
+
+ response = self.src_msg_runner.service_update(
+ ctxt, self.tgt_cell_name,
+ 'fake_host', binary, params_to_update)
+ result = response.value_or_raise()
+ result.pop('created_at', None)
+ result.pop('updated_at', None)
+ expected_result = dict(
+ deleted=0, deleted_at=None,
+ binary=fake_service['binary'],
+ disabled=True, # We just updated this..
+ report_count=13, # ..and this
+ host='fake_host', id=42,
+ topic='compute')
+ self.assertEqual(expected_result, result)
+
def test_proxy_rpc_to_manager_call(self):
fake_topic = 'fake-topic'
fake_rpc_message = 'fake-rpc-message'
diff --git a/nova/tests/cells/test_cells_rpcapi.py b/nova/tests/cells/test_cells_rpcapi.py
index 0a5c6a71b..76c9f05d3 100644
--- a/nova/tests/cells/test_cells_rpcapi.py
+++ b/nova/tests/cells/test_cells_rpcapi.py
@@ -248,6 +248,20 @@ class CellsAPITestCase(test.TestCase):
version='1.2')
self.assertEqual(result, 'fake_response')
+ def test_service_update(self):
+ call_info = self._stub_rpc_method('call', 'fake_response')
+ result = self.cells_rpcapi.service_update(
+ self.fake_context, host_name='fake-host-name',
+ binary='nova-api', params_to_update={'disabled': True})
+ expected_args = {
+ 'host_name': 'fake-host-name',
+ 'binary': 'nova-api',
+ 'params_to_update': {'disabled': True}}
+ self._check_result(call_info, 'service_update',
+ expected_args,
+ version='1.7')
+ self.assertEqual(result, 'fake_response')
+
def test_proxy_rpc_to_manager(self):
call_info = self._stub_rpc_method('call', 'fake_response')
result = self.cells_rpcapi.proxy_rpc_to_manager(
diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py
index e00b4bb24..66c04ced8 100644
--- a/nova/tests/compute/test_claims.py
+++ b/nova/tests/compute/test_claims.py
@@ -30,7 +30,7 @@ class DummyTracker(object):
def abort_instance_claim(self, *args, **kwargs):
self.icalled = True
- def abort_resize_claim(self, *args, **kwargs):
+ def drop_resize_claim(self, *args, **kwargs):
self.rcalled = True
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index dbd72a797..4f843bc05 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -22,6 +22,7 @@ import base64
import copy
import datetime
import sys
+import testtools
import time
import traceback
import uuid
@@ -1265,6 +1266,33 @@ class ComputeTestCase(BaseTestCase):
self.compute.terminate_instance(self.context, instance=instance)
+ def test_rescue_handle_err(self):
+ # If the driver fails to rescue, instance state should remain the same
+ # and the exception should be converted to InstanceNotRescuable
+ instance = jsonutils.to_primitive(self._create_fake_instance())
+ self.mox.StubOutWithMock(self.compute, '_get_rescue_image_ref')
+ self.mox.StubOutWithMock(nova.virt.fake.FakeDriver, 'rescue')
+
+ self.compute._get_rescue_image_ref(
+ mox.IgnoreArg(), instance).AndReturn('resc_image_ref')
+ nova.virt.fake.FakeDriver.rescue(
+ mox.IgnoreArg(), instance, [], mox.IgnoreArg(), 'password'
+ ).AndRaise(RuntimeError("Try again later"))
+
+ self.mox.ReplayAll()
+
+ expected_message = ('Instance %s cannot be rescued: '
+ 'Driver Error: Try again later' % instance['uuid'])
+ instance['vm_state'] = 'some_random_state'
+
+ with testtools.ExpectedException(
+ exception.InstanceNotRescuable, expected_message):
+ self.compute.rescue_instance(
+ self.context, instance=instance,
+ rescue_password='password')
+
+ self.assertEqual('some_random_state', instance['vm_state'])
+
def test_power_on(self):
# Ensure instance can be powered on.
diff --git a/nova/tests/compute/test_host_api.py b/nova/tests/compute/test_host_api.py
index 66dd1d739..6a87205ae 100644
--- a/nova/tests/compute/test_host_api.py
+++ b/nova/tests/compute/test_host_api.py
@@ -205,6 +205,27 @@ class ComputeHostAPITestCase(test.TestCase):
'fake-host')
self.assertEqual('fake-response', result)
+ def test_service_update(self):
+ host_name = 'fake-host'
+ binary = 'nova-compute'
+ params_to_update = dict(disabled=True)
+ service_id = 42
+ expected_result = {'id': service_id}
+
+ self.mox.StubOutWithMock(self.host_api.db, 'service_get_by_args')
+ self.host_api.db.service_get_by_args(self.ctxt,
+ host_name, binary).AndReturn({'id': service_id})
+
+ self.mox.StubOutWithMock(self.host_api.db, 'service_update')
+ self.host_api.db.service_update(
+ self.ctxt, service_id, params_to_update).AndReturn(expected_result)
+
+ self.mox.ReplayAll()
+
+ result = self.host_api.service_update(
+ self.ctxt, host_name, binary, params_to_update)
+ self.assertEqual(expected_result, result)
+
def test_instance_get_all_by_host(self):
self.mox.StubOutWithMock(self.host_api.db,
'instance_get_all_by_host')
@@ -312,6 +333,24 @@ class ComputeHostAPICellsTestCase(ComputeHostAPITestCase):
'fake-host')
self.assertEqual('fake-response', result)
+ def test_service_update(self):
+ host_name = 'fake-host'
+ binary = 'nova-compute'
+ params_to_update = dict(disabled=True)
+ service_id = 42
+ expected_result = {'id': service_id}
+
+ self.mox.StubOutWithMock(self.host_api.cells_rpcapi, 'service_update')
+ self.host_api.cells_rpcapi.service_update(
+ self.ctxt, host_name,
+ binary, params_to_update).AndReturn(expected_result)
+
+ self.mox.ReplayAll()
+
+ result = self.host_api.service_update(
+ self.ctxt, host_name, binary, params_to_update)
+ self.assertEqual(expected_result, result)
+
def test_instance_get_all_by_host(self):
instances = [dict(id=1, cell_name='cell1', host='host1'),
dict(id=2, cell_name='cell2', host='host1'),
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index af9b7b8bb..6d26174c7 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -770,9 +770,7 @@ class ResizeClaimTestCase(BaseTrackerTestCase):
def test_revert(self):
self.tracker.resize_claim(self.context, self.instance,
self.instance_type, self.limits)
- migration, itype = self.tracker.tracked_migrations[
- self.instance['uuid']]
- self.tracker.revert_resize(self.context, migration)
+ self.tracker.drop_resize_claim(self.instance)
self.assertEqual(0, len(self.tracker.tracked_instances))
self.assertEqual(0, len(self.tracker.tracked_migrations))
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 41bec05e1..ae5a6102c 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -20,6 +20,7 @@ Tests for Consoleauth Code.
"""
+import mox
from nova.consoleauth import manager
from nova import context
from nova.openstack.common import timeutils
@@ -37,7 +38,7 @@ class ConsoleauthTestCase(test.TestCase):
def test_tokens_expire(self):
# Test that tokens expire correctly.
self.useFixture(test.TimeOverride())
- token = 'mytok'
+ token = u'mytok'
self.flags(console_token_ttl=1)
self._stub_validate_console_port(True)
@@ -58,8 +59,8 @@ class ConsoleauthTestCase(test.TestCase):
fake_validate_console_port)
def test_multiple_tokens_for_instance(self):
- tokens = ["token" + str(i) for i in xrange(10)]
- instance = "12345"
+ tokens = [u"token" + str(i) for i in xrange(10)]
+ instance = u"12345"
self._stub_validate_console_port(True)
@@ -72,8 +73,8 @@ class ConsoleauthTestCase(test.TestCase):
self.assertTrue(self.manager.check_token(self.context, token))
def test_delete_tokens_for_instance(self):
- instance = "12345"
- tokens = ["token" + str(i) for i in xrange(10)]
+ instance = u"12345"
+ tokens = [u"token" + str(i) for i in xrange(10)]
for token in tokens:
self.manager.authorize_console(self.context, token, 'novnc',
'127.0.0.1', '8080', 'host',
@@ -87,20 +88,20 @@ class ConsoleauthTestCase(test.TestCase):
self.assertFalse(self.manager.check_token(self.context, token))
def test_wrong_token_has_port(self):
- token = 'mytok'
+ token = u'mytok'
self._stub_validate_console_port(False)
self.manager.authorize_console(self.context, token, 'novnc',
'127.0.0.1', '8080', 'host',
- instance_uuid='instance')
+ instance_uuid=u'instance')
self.assertFalse(self.manager.check_token(self.context, token))
def test_console_no_instance_uuid(self):
- self.manager.authorize_console(self.context, "token", 'novnc',
+ self.manager.authorize_console(self.context, u"token", 'novnc',
'127.0.0.1', '8080', 'host',
instance_uuid=None)
- self.assertFalse(self.manager.check_token(self.context, "token"))
+ self.assertFalse(self.manager.check_token(self.context, u"token"))
def test_get_backdoor_port(self):
self.manager.backdoor_port = 59697
@@ -108,6 +109,48 @@ class ConsoleauthTestCase(test.TestCase):
self.assertEqual(port, self.manager.backdoor_port)
+class ControlauthMemcacheEncodingTestCase(test.TestCase):
+ def setUp(self):
+ super(ControlauthMemcacheEncodingTestCase, self).setUp()
+ self.manager = manager.ConsoleAuthManager()
+ self.context = context.get_admin_context()
+ self.u_token = u"token"
+ self.u_instance = u"instance"
+
+ def test_authorize_console_encoding(self):
+ self.mox.StubOutWithMock(self.manager.mc, "set")
+ self.mox.StubOutWithMock(self.manager.mc, "get")
+ self.manager.mc.set(mox.IsA(str), mox.IgnoreArg(), mox.IgnoreArg()
+ ).AndReturn(True)
+ self.manager.mc.get(mox.IsA(str)).AndReturn(None)
+ self.manager.mc.set(mox.IsA(str), mox.IgnoreArg()).AndReturn(True)
+
+ self.mox.ReplayAll()
+
+ self.manager.authorize_console(self.context, self.u_token, 'novnc',
+ '127.0.0.1', '8080', 'host',
+ self.u_instance)
+
+ def test_check_token_encoding(self):
+ self.mox.StubOutWithMock(self.manager.mc, "get")
+ self.manager.mc.get(mox.IsA(str)).AndReturn(None)
+
+ self.mox.ReplayAll()
+
+ self.manager.check_token(self.context, self.u_token)
+
+ def test_delete_tokens_for_instance_encoding(self):
+ self.mox.StubOutWithMock(self.manager.mc, "delete")
+ self.mox.StubOutWithMock(self.manager.mc, "get")
+ self.manager.mc.get(mox.IsA(str)).AndReturn('["token"]')
+ self.manager.mc.delete(mox.IsA(str)).AndReturn(True)
+ self.manager.mc.delete(mox.IsA(str)).AndReturn(True)
+
+ self.mox.ReplayAll()
+
+ self.manager.delete_tokens_for_instance(self.context, self.u_instance)
+
+
class CellsConsoleauthTestCase(ConsoleauthTestCase):
"""Test Case for consoleauth w/ cells enabled."""
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 0af6ed143..d834d03f9 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -1059,56 +1059,6 @@ class DbApiTestCase(DbTestCase):
self.assertEqual(db.network_in_use_on_host(ctxt, 1, 'foo'), True)
self.assertEqual(db.network_in_use_on_host(ctxt, 1, 'bar'), False)
- def _timeout_test(self, ctxt, timeout, multi_host):
- values = {'host': 'foo'}
- instance = db.instance_create(ctxt, values)
- values = {'multi_host': multi_host, 'host': 'bar'}
- net = db.network_create_safe(ctxt, values)
- old = time = timeout - datetime.timedelta(seconds=5)
- new = time = timeout + datetime.timedelta(seconds=5)
- # should deallocate
- values = {'allocated': False,
- 'instance_uuid': instance['uuid'],
- 'network_id': net['id'],
- 'updated_at': old}
- db.fixed_ip_create(ctxt, values)
- # still allocated
- values = {'allocated': True,
- 'instance_uuid': instance['uuid'],
- 'network_id': net['id'],
- 'updated_at': old}
- db.fixed_ip_create(ctxt, values)
- # wrong network
- values = {'allocated': False,
- 'instance_uuid': instance['uuid'],
- 'network_id': None,
- 'updated_at': old}
- db.fixed_ip_create(ctxt, values)
- # too new
- values = {'allocated': False,
- 'instance_uuid': instance['uuid'],
- 'network_id': None,
- 'updated_at': new}
- db.fixed_ip_create(ctxt, values)
-
- def test_fixed_ip_disassociate_all_by_timeout_single_host(self):
- now = timeutils.utcnow()
- ctxt = context.get_admin_context()
- self._timeout_test(ctxt, now, False)
- result = db.fixed_ip_disassociate_all_by_timeout(ctxt, 'foo', now)
- self.assertEqual(result, 0)
- result = db.fixed_ip_disassociate_all_by_timeout(ctxt, 'bar', now)
- self.assertEqual(result, 1)
-
- def test_fixed_ip_disassociate_all_by_timeout_multi_host(self):
- now = timeutils.utcnow()
- ctxt = context.get_admin_context()
- self._timeout_test(ctxt, now, True)
- result = db.fixed_ip_disassociate_all_by_timeout(ctxt, 'foo', now)
- self.assertEqual(result, 1)
- result = db.fixed_ip_disassociate_all_by_timeout(ctxt, 'bar', now)
- self.assertEqual(result, 0)
-
def test_get_vol_mapping_non_admin(self):
ref = db.ec2_volume_create(self.context, 'fake-uuid')
ec2_id = db.get_ec2_volume_id_by_uuid(self.context, 'fake-uuid')
@@ -1856,6 +1806,14 @@ class ModelsObjectComparatorMixin(object):
for o1 in objs1:
self._assertEqualObjects(o1, objs2[o1['id']], ignored_keys)
+ def _assertEqualListsOfPrimitivesAsSets(self, primitives1, primitives2):
+ self.assertEqual(len(primitives1), len(primitives2))
+ for primitive in primitives1:
+ self.assertIn(primitive, primitives2)
+
+ for primitive in primitives2:
+ self.assertIn(primitive, primitives1)
+
class ServiceTestCase(test.TestCase, ModelsObjectComparatorMixin):
def setUp(self):
@@ -2083,6 +2041,10 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
r_inst_type2 = db.instance_type_get(self.ctxt, inst_type2['id'])
self._assertEqualObjects(inst_type2, r_inst_type2, 'extra_specs')
+ def test_instance_type_destroy_not_found(self):
+ self.assertRaises(exception.InstanceTypeNotFound,
+ db.instance_type_destroy, self.ctxt, 'nonexists')
+
def test_instance_type_create_duplicate_name(self):
self._create_inst_type({})
self.assertRaises(exception.InstanceTypeExists,
@@ -2346,32 +2308,211 @@ class InstanceTypeAccessTestCase(BaseInstanceTypeTestCase):
self.ctxt, inst_type['flavorid'], 'p2')
-class TestFixedIPGetByNetworkHost(test.TestCase):
- def test_not_found_exception(self):
- ctxt = context.get_admin_context()
+class FixedIPTestCase(BaseInstanceTypeTestCase):
+ def _timeout_test(self, ctxt, timeout, multi_host):
+ instance = db.instance_create(ctxt, dict(host='foo'))
+ net = db.network_create_safe(ctxt, dict(multi_host=multi_host,
+ host='bar'))
+ old = timeout - datetime.timedelta(seconds=5)
+ new = timeout + datetime.timedelta(seconds=5)
+ # should deallocate
+ db.fixed_ip_create(ctxt, dict(allocated=False,
+ instance_uuid=instance['uuid'],
+ network_id=net['id'],
+ updated_at=old))
+ # still allocated
+ db.fixed_ip_create(ctxt, dict(allocated=True,
+ instance_uuid=instance['uuid'],
+ network_id=net['id'],
+ updated_at=old))
+ # wrong network
+ db.fixed_ip_create(ctxt, dict(allocated=False,
+ instance_uuid=instance['uuid'],
+ network_id=None,
+ updated_at=old))
+ # too new
+ db.fixed_ip_create(ctxt, dict(allocated=False,
+ instance_uuid=instance['uuid'],
+ network_id=None,
+ updated_at=new))
+
+ def test_fixed_ip_disassociate_all_by_timeout_single_host(self):
+ now = timeutils.utcnow()
+ self._timeout_test(self.ctxt, now, False)
+ result = db.fixed_ip_disassociate_all_by_timeout(self.ctxt, 'foo', now)
+ self.assertEqual(result, 0)
+ result = db.fixed_ip_disassociate_all_by_timeout(self.ctxt, 'bar', now)
+ self.assertEqual(result, 1)
+
+ def test_fixed_ip_disassociate_all_by_timeout_multi_host(self):
+ now = timeutils.utcnow()
+ self._timeout_test(self.ctxt, now, True)
+ result = db.fixed_ip_disassociate_all_by_timeout(self.ctxt, 'foo', now)
+ self.assertEqual(result, 1)
+ result = db.fixed_ip_disassociate_all_by_timeout(self.ctxt, 'bar', now)
+ self.assertEqual(result, 0)
+ def test_fixed_ip_get_by_network_host_not_found_exception(self):
self.assertRaises(
exception.FixedIpNotFoundForNetworkHost,
db.fixed_ip_get_by_network_host,
- ctxt, 1, 'ignore')
+ self.ctxt, 1, 'ignore')
- def test_fixed_ip_found(self):
- ctxt = context.get_admin_context()
- db.fixed_ip_create(ctxt, dict(network_id=1, host='host'))
+ def test_fixed_ip_get_by_network_host_fixed_ip_found(self):
+ db.fixed_ip_create(self.ctxt, dict(network_id=1, host='host'))
- fip = db.fixed_ip_get_by_network_host(ctxt, 1, 'host')
+ fip = db.fixed_ip_get_by_network_host(self.ctxt, 1, 'host')
self.assertEquals(1, fip['network_id'])
self.assertEquals('host', fip['host'])
+ def _create_instance(self, project_id=None):
+ instance = db.instance_create(self.ctxt, dict(project_id=project_id))
+ return instance['uuid']
+
+ def test_fixed_ip_get_by_instance_fixed_ip_found(self):
+ instance_uuid = self._create_instance()
+
+ FIXED_IP_ADDRESS = 'address'
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address=FIXED_IP_ADDRESS))
+
+ ips_list = db.fixed_ip_get_by_instance(self.ctxt, instance_uuid)
+ self._assertEqualListsOfPrimitivesAsSets([FIXED_IP_ADDRESS],
+ [ips_list[0].address])
+
+ def test_fixed_ip_get_by_instance_multiple_fixed_ips_found(self):
+ instance_uuid = self._create_instance()
-class TestIpAllocation(test.TestCase):
+ FIXED_IP_ADDRESS_1 = 'address_1'
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address=FIXED_IP_ADDRESS_1))
+ FIXED_IP_ADDRESS_2 = 'address_2'
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address=FIXED_IP_ADDRESS_2))
+
+ ips_list = db.fixed_ip_get_by_instance(self.ctxt, instance_uuid)
+ self._assertEqualListsOfPrimitivesAsSets(
+ [FIXED_IP_ADDRESS_1, FIXED_IP_ADDRESS_2],
+ [ips_list[0].address, ips_list[1].address])
- def setUp(self):
- super(TestIpAllocation, self).setUp()
- self.ctxt = context.get_admin_context()
- self.instance = db.instance_create(self.ctxt, {})
- self.network = db.network_create_safe(self.ctxt, {})
+ def test_fixed_ip_get_by_instance_inappropriate_ignored(self):
+ instance_uuid = self._create_instance()
+
+ FIXED_IP_ADDRESS_1 = 'address_1'
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address=FIXED_IP_ADDRESS_1))
+ FIXED_IP_ADDRESS_2 = 'address_2'
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address=FIXED_IP_ADDRESS_2))
+
+ another_instance = db.instance_create(self.ctxt, {})
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=another_instance['uuid'], address="another_addr"))
+
+ ips_list = db.fixed_ip_get_by_instance(self.ctxt, instance_uuid)
+ self._assertEqualListsOfPrimitivesAsSets(
+ [FIXED_IP_ADDRESS_1, FIXED_IP_ADDRESS_2],
+ [ips_list[0].address, ips_list[1].address])
+
+ def test_fixed_ip_get_by_instance_not_found_exception(self):
+ instance_uuid = self._create_instance()
+
+ self.assertRaises(exception.FixedIpNotFoundForInstance,
+ db.fixed_ip_get_by_instance,
+ self.ctxt, instance_uuid)
+
+ def test_fixed_ips_by_virtual_interface_fixed_ip_found(self):
+ instance_uuid = self._create_instance()
+
+ vif = db.virtual_interface_create(
+ self.ctxt, dict(instance_uuid=instance_uuid))
+
+ FIXED_IP_ADDRESS = 'address'
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=vif.id, address=FIXED_IP_ADDRESS))
+
+ ips_list = db.fixed_ips_by_virtual_interface(self.ctxt, vif.id)
+ self._assertEqualListsOfPrimitivesAsSets([FIXED_IP_ADDRESS],
+ [ips_list[0].address])
+
+ def test_fixed_ips_by_virtual_interface_multiple_fixed_ips_found(self):
+ instance_uuid = self._create_instance()
+
+ vif = db.virtual_interface_create(
+ self.ctxt, dict(instance_uuid=instance_uuid))
+
+ FIXED_IP_ADDRESS_1 = 'address_1'
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=vif.id, address=FIXED_IP_ADDRESS_1))
+ FIXED_IP_ADDRESS_2 = 'address_2'
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=vif.id, address=FIXED_IP_ADDRESS_2))
+
+ ips_list = db.fixed_ips_by_virtual_interface(self.ctxt, vif.id)
+ self._assertEqualListsOfPrimitivesAsSets(
+ [FIXED_IP_ADDRESS_1, FIXED_IP_ADDRESS_2],
+ [ips_list[0].address, ips_list[1].address])
+
+ def test_fixed_ips_by_virtual_interface_inappropriate_ignored(self):
+ instance_uuid = self._create_instance()
+
+ vif = db.virtual_interface_create(
+ self.ctxt, dict(instance_uuid=instance_uuid))
+
+ FIXED_IP_ADDRESS_1 = 'address_1'
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=vif.id, address=FIXED_IP_ADDRESS_1))
+ FIXED_IP_ADDRESS_2 = 'address_2'
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=vif.id, address=FIXED_IP_ADDRESS_2))
+
+ another_vif = db.virtual_interface_create(
+ self.ctxt, dict(instance_uuid=instance_uuid))
+ db.fixed_ip_create(self.ctxt, dict(
+ virtual_interface_id=another_vif.id, address="another_addr"))
+
+ ips_list = db.fixed_ips_by_virtual_interface(self.ctxt, vif.id)
+ self._assertEqualListsOfPrimitivesAsSets(
+ [FIXED_IP_ADDRESS_1, FIXED_IP_ADDRESS_2],
+ [ips_list[0].address, ips_list[1].address])
+
+ def test_fixed_ips_by_virtual_interface_no_ip_found(self):
+ instance_uuid = self._create_instance()
+
+ vif = db.virtual_interface_create(
+ self.ctxt, dict(instance_uuid=instance_uuid))
+
+ ips_list = db.fixed_ips_by_virtual_interface(self.ctxt, vif.id)
+ self.assertEquals(0, len(ips_list))
+
+ @test.testtools.skip("bug #1171161")
+ def test_fixed_ip_count_by_project_one_ip(self):
+ PROJECT_ID = "project_id"
+ instance_uuid = self._create_instance(PROJECT_ID)
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address='address'))
+
+ ips_count = db.fixed_ip_count_by_project(self.ctxt, PROJECT_ID)
+ self.assertEquals(1, ips_count)
+
+ @test.testtools.skip("bug #1171161")
+ def test_fixed_ip_count_by_project_two_ips_for_different_instances(self):
+ PROJECT_ID = "project_id"
+ instance_uuid = self._create_instance(PROJECT_ID)
+
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=instance_uuid, address='address_1'))
+
+ another_instance_for_this_project =\
+ db.instance_create(self.ctxt, dict(project_id=PROJECT_ID))
+
+ db.fixed_ip_create(self.ctxt, dict(
+ instance_uuid=another_instance_for_this_project['uuid'],
+ address='address_2'))
+
+ ips_count = db.fixed_ip_count_by_project(self.ctxt, PROJECT_ID)
+ self.assertEquals(2, ips_count)
def create_fixed_ip(self, **params):
default_params = {'address': '192.168.0.1'}
@@ -2379,30 +2520,39 @@ class TestIpAllocation(test.TestCase):
return db.fixed_ip_create(self.ctxt, default_params)
def test_fixed_ip_associate_fails_if_ip_not_in_network(self):
+ instance_uuid = self._create_instance()
self.assertRaises(exception.FixedIpNotFoundForNetwork,
db.fixed_ip_associate,
- self.ctxt, None, self.instance['uuid'])
+ self.ctxt, None, instance_uuid)
def test_fixed_ip_associate_fails_if_ip_in_use(self):
- address = self.create_fixed_ip(instance_uuid=self.instance['uuid'])
+ instance_uuid = self._create_instance()
+
+ address = self.create_fixed_ip(instance_uuid=instance_uuid)
self.assertRaises(exception.FixedIpAlreadyInUse,
db.fixed_ip_associate,
- self.ctxt, address, self.instance['uuid'])
+ self.ctxt, address, instance_uuid)
def test_fixed_ip_associate_succeeds(self):
- address = self.create_fixed_ip(network_id=self.network['id'])
- db.fixed_ip_associate(self.ctxt, address, self.instance['uuid'],
- network_id=self.network['id'])
+ instance_uuid = self._create_instance()
+ network = db.network_create_safe(self.ctxt, {})
+
+ address = self.create_fixed_ip(network_id=network['id'])
+ db.fixed_ip_associate(self.ctxt, address, instance_uuid,
+ network_id=network['id'])
fixed_ip = db.fixed_ip_get_by_address(self.ctxt, address)
- self.assertEqual(fixed_ip['instance_uuid'], self.instance['uuid'])
+ self.assertEqual(fixed_ip['instance_uuid'], instance_uuid)
def test_fixed_ip_associate_succeeds_and_sets_network(self):
+ instance_uuid = self._create_instance()
+ network = db.network_create_safe(self.ctxt, {})
+
address = self.create_fixed_ip()
- db.fixed_ip_associate(self.ctxt, address, self.instance['uuid'],
- network_id=self.network['id'])
+ db.fixed_ip_associate(self.ctxt, address, instance_uuid,
+ network_id=network['id'])
fixed_ip = db.fixed_ip_get_by_address(self.ctxt, address)
- self.assertEqual(fixed_ip['instance_uuid'], self.instance['uuid'])
- self.assertEqual(fixed_ip['network_id'], self.network['id'])
+ self.assertEqual(fixed_ip['instance_uuid'], instance_uuid)
+ self.assertEqual(fixed_ip['network_id'], network['id'])
class InstanceDestroyConstraints(test.TestCase):
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index e26c25ff1..a955d2f38 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -42,6 +42,7 @@ from nova import exception
from nova.openstack.common import fileutils
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
+from nova.openstack.common import loopingcall
from nova.openstack.common import uuidutils
from nova import test
from nova.tests import fake_libvirt_utils
@@ -2488,7 +2489,7 @@ class LibvirtConnTestCase(test.TestCase):
self.mox.StubOutWithMock(os.path, "getsize")
os.path.getsize('/test/disk').AndReturn((10737418240))
- os.path.getsize('/test/disk.local').AndReturn((21474836480))
+ os.path.getsize('/test/disk.local').AndReturn((3328599655))
ret = ("image: /test/disk\n"
"file format: raw\n"
@@ -2512,10 +2513,12 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(info[0]['path'], '/test/disk')
self.assertEquals(info[0]['disk_size'], 10737418240)
self.assertEquals(info[0]['backing_file'], "")
+ self.assertEquals(info[0]['over_committed_disk_size'], 0)
self.assertEquals(info[1]['type'], 'qcow2')
self.assertEquals(info[1]['path'], '/test/disk.local')
self.assertEquals(info[1]['virt_disk_size'], 21474836480)
self.assertEquals(info[1]['backing_file'], "file")
+ self.assertEquals(info[1]['over_committed_disk_size'], 18146236825)
db.instance_destroy(self.context, instance_ref['uuid'])
@@ -3119,11 +3122,13 @@ class LibvirtConnTestCase(test.TestCase):
fake_disks = {'fake1': [{'type': 'qcow2', 'path': '/somepath/disk1',
'virt_disk_size': '10737418240',
'backing_file': '/somepath/disk1',
- 'disk_size':'83886080'}],
+ 'disk_size':'83886080',
+ 'over_committed_disk_size':'10653532160'}],
'fake2': [{'type': 'raw', 'path': '/somepath/disk2',
- 'virt_disk_size': '10737418240',
+ 'virt_disk_size': '0',
'backing_file': '/somepath/disk2',
- 'disk_size':'10737418240'}]}
+ 'disk_size':'10737418240',
+ 'over_committed_disk_size':'0'}]}
def get_info(instance_name):
return jsonutils.dumps(fake_disks.get(instance_name))
@@ -4844,7 +4849,7 @@ class LibvirtDriverTestCase(test.TestCase):
'uuid': 'not_found_uuid'})
# instance is running case
- self.assertRaises(utils.LoopingCallDone,
+ self.assertRaises(loopingcall.LoopingCallDone,
self.libvirtconnection._wait_for_running,
{'name': 'running',
'uuid': 'running_uuid'})
@@ -4984,7 +4989,7 @@ class LibvirtDriverTestCase(test.TestCase):
self.stubs.Set(self.libvirtconnection, 'to_xml', lambda *a, **k: None)
self.stubs.Set(self.libvirtconnection, '_create_domain_and_network',
lambda *a: None)
- self.stubs.Set(utils, 'FixedIntervalLoopingCall',
+ self.stubs.Set(loopingcall, 'FixedIntervalLoopingCall',
lambda *a, **k: FakeLoopingCall())
libvirt_utils.get_instance_path({}).AndReturn('/fake/foo')
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index a8278f085..cada3dd85 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -36,7 +36,7 @@ from nova.virt.powervm import common
from nova.virt.powervm import driver as powervm_driver
from nova.virt.powervm import exception
from nova.virt.powervm import lpar
-from nova.virt.powervm import operator
+from nova.virt.powervm import operator as powervm_operator
def fake_lpar(instance_name):
@@ -46,7 +46,16 @@ def fake_lpar(instance_name):
uptime=939395, state='Running')
-class FakeIVMOperator(object):
+class FakePowerVMOperator(powervm_operator.PowerVMOperator):
+
+ def get_lpar(self, instance_name, resource_type='lpar'):
+ return fake_lpar(instance_name)
+
+ def run_vios_command(self, cmd):
+ pass
+
+
+class FakeIVMOperator(powervm_operator.IVMOperator):
def get_lpar(self, instance_name, resource_type='lpar'):
return fake_lpar(instance_name)
@@ -101,6 +110,9 @@ class FakeIVMOperator(object):
def rename_lpar(self, old, new):
pass
+ def _remove_file(self, file_path):
+ pass
+
def set_lpar_mac_base_value(self, instance_name, mac):
pass
@@ -148,7 +160,7 @@ class FakeBlockAdapter(powervm_blockdev.PowerVMLocalVolumeAdapter):
def fake_get_powervm_operator():
- return FakeIVMOperator()
+ return FakeIVMOperator(None)
class PowerVMDriverTestCase(test.TestCase):
@@ -156,9 +168,9 @@ class PowerVMDriverTestCase(test.TestCase):
def setUp(self):
super(PowerVMDriverTestCase, self).setUp()
- self.stubs.Set(operator, 'get_powervm_operator',
+ self.stubs.Set(powervm_operator, 'get_powervm_operator',
fake_get_powervm_operator)
- self.stubs.Set(operator, 'get_powervm_disk_adapter',
+ self.stubs.Set(powervm_operator, 'get_powervm_disk_adapter',
lambda: FakeBlockAdapter())
self.powervm_connection = powervm_driver.PowerVMDriver(None)
self.instance = self._create_instance()
@@ -365,6 +377,37 @@ class PowerVMDriverTestCase(test.TestCase):
expected_path = 'some/image/path/logical-vol-name_rsz.gz'
self.assertEqual(file_path, expected_path)
+ def test_deploy_from_migrated_file(self):
+ instance = self.instance
+ context = 'fake_context'
+ network_info = []
+ network_info.append({'address': 'fa:89:f0:8b:9b:39'})
+ dest = '10.8.46.20'
+ disk_info = {}
+ disk_info['root_disk_file'] = 'some/file/path.gz'
+ disk_info['old_lv_size'] = 30
+ self.flags(powervm_mgr=dest)
+ fake_op = self.powervm_connection._powervm
+ self.deploy_from_vios_file_called = False
+
+ def fake_deploy_from_vios_file(lpar, file_path, size,
+ decompress):
+ exp_file_path = 'some/file/path.gz'
+ exp_size = 40 * 1024 ** 3
+ exp_decompress = True
+ self.deploy_from_vios_file_called = True
+ self.assertEqual(exp_file_path, file_path)
+ self.assertEqual(exp_size, size)
+ self.assertEqual(exp_decompress, decompress)
+
+ self.stubs.Set(fake_op, '_deploy_from_vios_file',
+ fake_deploy_from_vios_file)
+ self.powervm_connection.finish_migration(context, None,
+ instance, disk_info, network_info,
+ None, resize_instance=True,
+ block_device_info=None)
+ self.assertEqual(self.deploy_from_vios_file_called, True)
+
def test_set_lpar_mac_base_value(self):
instance = self.instance
context = 'fake_context'
@@ -392,7 +435,7 @@ class PowerVMDriverTestCase(test.TestCase):
def fake_set_lpar_mac_base_value(inst_name, mac, *args, **kwargs):
# get expected mac address from FakeIVM set
- fake_ivm = FakeIVMOperator()
+ fake_ivm = FakeIVMOperator(None)
exp_mac = fake_ivm.macs_for_instance(inst_name).pop()
self.assertEqual(exp_mac, mac)
@@ -478,7 +521,7 @@ class PowerVMDriverLparTestCase(test.TestCase):
def setUp(self):
super(PowerVMDriverLparTestCase, self).setUp()
- self.stubs.Set(operator.PowerVMOperator, '_update_host_stats',
+ self.stubs.Set(powervm_operator.PowerVMOperator, '_update_host_stats',
lambda self: None)
self.powervm_connection = powervm_driver.PowerVMDriver(None)
diff --git a/nova/utils.py b/nova/utils.py
index 7a586c322..bb002b9e7 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -38,7 +38,6 @@ import tempfile
import time
from xml.sax import saxutils
-from eventlet import event
from eventlet.green import subprocess
from eventlet import greenthread
import netaddr
@@ -547,113 +546,6 @@ class LazyPluggable(object):
return getattr(backend, key)
-class LoopingCallDone(Exception):
- """Exception to break out and stop a LoopingCall.
-
- The poll-function passed to LoopingCall can raise this exception to
- break out of the loop normally. This is somewhat analogous to
- StopIteration.
-
- An optional return-value can be included as the argument to the exception;
- this return-value will be returned by LoopingCall.wait()
-
- """
-
- def __init__(self, retvalue=True):
- """:param retvalue: Value that LoopingCall.wait() should return."""
- self.retvalue = retvalue
-
-
-class LoopingCallBase(object):
- def __init__(self, f=None, *args, **kw):
- self.args = args
- self.kw = kw
- self.f = f
- self._running = False
- self.done = None
-
- def stop(self):
- self._running = False
-
- def wait(self):
- return self.done.wait()
-
-
-class FixedIntervalLoopingCall(LoopingCallBase):
- """A looping call which happens at a fixed interval."""
-
- def start(self, interval, initial_delay=None):
- self._running = True
- done = event.Event()
-
- def _inner():
- if initial_delay:
- greenthread.sleep(initial_delay)
-
- try:
- while self._running:
- self.f(*self.args, **self.kw)
- if not self._running:
- break
- greenthread.sleep(interval)
- except LoopingCallDone, e:
- self.stop()
- done.send(e.retvalue)
- except Exception:
- LOG.exception(_('in fixed duration looping call'))
- done.send_exception(*sys.exc_info())
- return
- else:
- done.send(True)
-
- self.done = done
-
- greenthread.spawn(_inner)
- return self.done
-
-
-class DynamicLoopingCall(LoopingCallBase):
- """A looping call which happens sleeps until the next known event.
-
- The function called should return how long to sleep for before being
- called again.
- """
-
- def start(self, initial_delay=None, periodic_interval_max=None):
- self._running = True
- done = event.Event()
-
- def _inner():
- if initial_delay:
- greenthread.sleep(initial_delay)
-
- try:
- while self._running:
- idle = self.f(*self.args, **self.kw)
- if not self._running:
- break
-
- if periodic_interval_max is not None:
- idle = min(idle, periodic_interval_max)
- LOG.debug(_('Periodic task processor sleeping for %.02f '
- 'seconds'), idle)
- greenthread.sleep(idle)
- except LoopingCallDone, e:
- self.stop()
- done.send(e.retvalue)
- except Exception:
- LOG.exception(_('in dynamic looping call'))
- done.send_exception(*sys.exc_info())
- return
- else:
- done.send(True)
-
- self.done = done
-
- greenthread.spawn(_inner)
- return self.done
-
-
def xhtml_escape(value):
"""Escapes a string so it is valid within XML or XHTML.
diff --git a/nova/virt/baremetal/ipmi.py b/nova/virt/baremetal/ipmi.py
index 7cc272c32..d4377e6fa 100644
--- a/nova/virt/baremetal/ipmi.py
+++ b/nova/virt/baremetal/ipmi.py
@@ -29,6 +29,7 @@ from oslo.config import cfg
from nova import exception
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova import paths
from nova import utils
from nova.virt.baremetal import baremetal_states
@@ -149,10 +150,10 @@ class IPMI(base.PowerManager):
if self._is_power("on"):
self.state = baremetal_states.ACTIVE
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
if self.retries > CONF.baremetal.ipmi_power_retry:
self.state = baremetal_states.ERROR
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
try:
self.retries += 1
self._exec_ipmitool("power on")
@@ -160,7 +161,7 @@ class IPMI(base.PowerManager):
LOG.exception(_("IPMI power on failed"))
self.retries = 0
- timer = utils.FixedIntervalLoopingCall(_wait_for_power_on)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_power_on)
timer.start(interval=0.5).wait()
def _power_off(self):
@@ -171,10 +172,10 @@ class IPMI(base.PowerManager):
if self._is_power("off"):
self.state = baremetal_states.DELETED
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
if self.retries > CONF.baremetal.ipmi_power_retry:
self.state = baremetal_states.ERROR
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
try:
self.retries += 1
self._exec_ipmitool("power off")
@@ -182,7 +183,7 @@ class IPMI(base.PowerManager):
LOG.exception(_("IPMI power off failed"))
self.retries = 0
- timer = utils.FixedIntervalLoopingCall(_wait_for_power_off)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_power_off)
timer.start(interval=0.5).wait()
def _set_pxe_for_next_boot(self):
diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py
index 6d4a2965b..795099ebc 100644
--- a/nova/virt/baremetal/pxe.py
+++ b/nova/virt/baremetal/pxe.py
@@ -30,8 +30,8 @@ from nova import exception
from nova.openstack.common.db import exception as db_exc
from nova.openstack.common import fileutils
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.openstack.common import timeutils
-from nova import utils
from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import base
from nova.virt.baremetal import db
@@ -458,7 +458,7 @@ class PXE(base.NodeDriver):
if instance['uuid'] != row.get('instance_uuid'):
locals['error'] = _("Node associated with another instance"
" while waiting for deploy of %s")
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
status = row.get('task_state')
if (status == baremetal_states.DEPLOYING
@@ -470,7 +470,7 @@ class PXE(base.NodeDriver):
baremetal_states.ACTIVE):
LOG.info(_("PXE deploy completed for instance %s")
% instance['uuid'])
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
elif status == baremetal_states.DEPLOYFAIL:
locals['error'] = _("PXE deploy failed for instance %s")
except exception.NodeNotFound:
@@ -482,11 +482,11 @@ class PXE(base.NodeDriver):
locals['error'] = _("Timeout reached while waiting for "
"PXE deploy of instance %s")
if locals['error']:
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
expiration = timeutils.utcnow() + datetime.timedelta(
seconds=CONF.baremetal.pxe_deploy_timeout)
- timer = utils.FixedIntervalLoopingCall(_wait_for_deploy)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_deploy)
timer.start(interval=1).wait()
if locals['error']:
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 7c7c5f97b..6dcca6054 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -75,6 +75,7 @@ from nova.openstack.common import fileutils
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova.openstack.common.notifier import api as notifier
from nova import utils
from nova import version
@@ -734,12 +735,12 @@ class LibvirtDriver(driver.ComputeDriver):
except exception.NotFound:
LOG.error(_("During wait destroy, instance disappeared."),
instance=instance)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
if state == power_state.SHUTDOWN:
LOG.info(_("Instance destroyed successfully."),
instance=instance)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
# NOTE(wangpan): If the instance was booted again after destroy,
# this may be a endless loop, so check the id of
@@ -750,10 +751,11 @@ class LibvirtDriver(driver.ComputeDriver):
LOG.info(_("Instance may be started again."),
instance=instance)
kwargs['is_running'] = True
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
kwargs = {'is_running': False}
- timer = utils.FixedIntervalLoopingCall(_wait_for_destroy, old_domid)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_destroy,
+ old_domid)
timer.start(interval=0.5).wait()
if kwargs['is_running']:
LOG.info(_("Going to destroy instance again."), instance=instance)
@@ -1327,8 +1329,8 @@ class LibvirtDriver(driver.ComputeDriver):
LOG.info(_("Instance shutdown successfully."),
instance=instance)
self._create_domain(domain=dom)
- timer = utils.FixedIntervalLoopingCall(self._wait_for_running,
- instance)
+ timer = loopingcall.FixedIntervalLoopingCall(
+ self._wait_for_running, instance)
timer.start(interval=0.5).wait()
return True
elif old_domid != new_domid:
@@ -1382,9 +1384,9 @@ class LibvirtDriver(driver.ComputeDriver):
if state == power_state.RUNNING:
LOG.info(_("Instance rebooted successfully."),
instance=instance)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
- timer = utils.FixedIntervalLoopingCall(_wait_for_reboot)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_reboot)
timer.start(interval=0.5).wait()
def pause(self, instance):
@@ -1405,8 +1407,8 @@ class LibvirtDriver(driver.ComputeDriver):
"""Power on the specified instance."""
dom = self._lookup_by_name(instance['name'])
self._create_domain(domain=dom, instance=instance)
- timer = utils.FixedIntervalLoopingCall(self._wait_for_running,
- instance)
+ timer = loopingcall.FixedIntervalLoopingCall(self._wait_for_running,
+ instance)
timer.start(interval=0.5).wait()
def suspend(self, instance):
@@ -1534,9 +1536,9 @@ class LibvirtDriver(driver.ComputeDriver):
if state == power_state.RUNNING:
LOG.info(_("Instance spawned successfully."),
instance=instance)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
- timer = utils.FixedIntervalLoopingCall(_wait_for_boot)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_boot)
timer.start(interval=0.5).wait()
def _flush_libvirt_console(self, pty):
@@ -3139,7 +3141,7 @@ class LibvirtDriver(driver.ComputeDriver):
recover_method(ctxt, instance_ref, dest, block_migration)
# Waiting for completion of live_migration.
- timer = utils.FixedIntervalLoopingCall(f=None)
+ timer = loopingcall.FixedIntervalLoopingCall(f=None)
def wait_for_live_migration():
"""waiting for live migration completion."""
@@ -3374,15 +3376,18 @@ class LibvirtDriver(driver.ComputeDriver):
if disk_type == "qcow2":
backing_file = libvirt_utils.get_disk_backing_file(path)
virt_size = disk.get_disk_size(path)
+ over_commit_size = int(virt_size) - dk_size
else:
backing_file = ""
virt_size = 0
+ over_commit_size = 0
disk_info.append({'type': disk_type,
'path': path,
'virt_disk_size': virt_size,
'backing_file': backing_file,
- 'disk_size': dk_size})
+ 'disk_size': dk_size,
+ 'over_committed_disk_size': over_commit_size})
return jsonutils.dumps(disk_info)
def get_disk_over_committed_size_total(self):
@@ -3395,9 +3400,8 @@ class LibvirtDriver(driver.ComputeDriver):
disk_infos = jsonutils.loads(
self.get_instance_disk_info(i_name))
for info in disk_infos:
- i_vt_sz = int(info['virt_disk_size'])
- i_dk_sz = int(info['disk_size'])
- disk_over_committed_size += i_vt_sz - i_dk_sz
+ disk_over_committed_size += int(
+ info['over_committed_disk_size'])
except OSError as e:
if e.errno == errno.ENOENT:
LOG.error(_("Getting disk size of %(i_name)s: %(e)s") %
@@ -3506,7 +3510,7 @@ class LibvirtDriver(driver.ComputeDriver):
if state == power_state.RUNNING:
LOG.info(_("Instance running successfully."), instance=instance)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
def finish_migration(self, context, migration, instance, disk_info,
network_info, image_meta, resize_instance,
@@ -3562,8 +3566,8 @@ class LibvirtDriver(driver.ComputeDriver):
write_to_disk=True)
self._create_domain_and_network(xml, instance, network_info,
block_device_info)
- timer = utils.FixedIntervalLoopingCall(self._wait_for_running,
- instance)
+ timer = loopingcall.FixedIntervalLoopingCall(self._wait_for_running,
+ instance)
timer.start(interval=0.5).wait()
def _cleanup_failed_migration(self, inst_base):
@@ -3596,8 +3600,8 @@ class LibvirtDriver(driver.ComputeDriver):
self._create_domain_and_network(xml, instance, network_info,
block_device_info)
- timer = utils.FixedIntervalLoopingCall(self._wait_for_running,
- instance)
+ timer = loopingcall.FixedIntervalLoopingCall(self._wait_for_running,
+ instance)
timer.start(interval=0.5).wait()
def confirm_migration(self, migration, instance, network_info):
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py
index 81ac0ac42..1d226ae83 100644
--- a/nova/virt/libvirt/volume.py
+++ b/nova/virt/libvirt/volume.py
@@ -29,6 +29,7 @@ from oslo.config import cfg
from nova import exception
from nova.openstack.common import lockutils
from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
from nova import paths
from nova.storage import linuxscsi
from nova import utils
@@ -538,7 +539,7 @@ class LibvirtAOEVolumeDriver(LibvirtBaseVolumeDriver):
def _wait_for_device_discovery(aoedevpath, mount_device):
tries = self.tries
if os.path.exists(aoedevpath):
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
if self.tries >= CONF.num_aoe_discover_tries:
raise exception.NovaException(_("AoE device not found at %s") %
@@ -551,8 +552,8 @@ class LibvirtAOEVolumeDriver(LibvirtBaseVolumeDriver):
self.tries = self.tries + 1
self.tries = 0
- timer = utils.FixedIntervalLoopingCall(_wait_for_device_discovery,
- aoedevpath, mount_device)
+ timer = loopingcall.FixedIntervalLoopingCall(
+ _wait_for_device_discovery, aoedevpath, mount_device)
timer.start(interval=2).wait()
tries = self.tries
@@ -701,7 +702,7 @@ class LibvirtFibreChannelVolumeDriver(LibvirtBaseVolumeDriver):
# get the /dev/sdX device. This is used
# to find the multipath device.
self.device_name = os.path.realpath(device)
- raise utils.LoopingCallDone()
+ raise loopingcall.LoopingCallDone()
if self.tries >= CONF.num_iscsi_scan_tries:
msg = _("Fibre Channel device not found.")
@@ -717,8 +718,8 @@ class LibvirtFibreChannelVolumeDriver(LibvirtBaseVolumeDriver):
self.host_device = None
self.device_name = None
self.tries = 0
- timer = utils.FixedIntervalLoopingCall(_wait_for_device_discovery,
- host_devices, mount_device)
+ timer = loopingcall.FixedIntervalLoopingCall(
+ _wait_for_device_discovery, host_devices, mount_device)
timer.start(interval=2).wait()
tries = self.tries
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index 0656f3972..518341910 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -415,23 +415,24 @@ class PowerVMOperator(object):
return disk_info
def deploy_from_migrated_file(self, lpar, file_path, size):
- # decompress file
- gzip_ending = '.gz'
- if file_path.endswith(gzip_ending):
- raw_file_path = file_path[:-len(gzip_ending)]
- else:
- raw_file_path = file_path
+ """Deploy the logical volume and attach to new lpar.
- self._operator._decompress_image_file(file_path, raw_file_path)
+ :param lpar: lar instance
+ :param file_path: logical volume path
+ :param size: new size of the logical volume
+ """
+ need_decompress = file_path.endswith('.gz')
try:
# deploy lpar from file
- self._deploy_from_vios_file(lpar, raw_file_path, size)
+ self._deploy_from_vios_file(lpar, file_path, size,
+ decompress=need_decompress)
finally:
# cleanup migrated file
- self._operator._remove_file(raw_file_path)
+ self._operator._remove_file(file_path)
- def _deploy_from_vios_file(self, lpar, file_path, size):
+ def _deploy_from_vios_file(self, lpar, file_path, size,
+ decompress=True):
self._operator.create_lpar(lpar)
lpar = self._operator.get_lpar(lpar['name'])
instance_id = lpar['lpar_id']
@@ -443,7 +444,8 @@ class PowerVMOperator(object):
self._operator.attach_disk_to_vhost(diskName, vhost)
# Copy file to device
- self._disk_adapter._copy_file_to_device(file_path, diskName)
+ self._disk_adapter._copy_file_to_device(file_path, diskName,
+ decompress)
self._operator.start_lpar(lpar['name'])
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 3fe9cd8ed..4fa1614e0 100755
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -46,7 +46,7 @@ from oslo.config import cfg
from nova import exception
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
-from nova import utils
+from nova.openstack.common import loopingcall
from nova.virt import driver
from nova.virt.vmwareapi import error_util
from nova.virt.vmwareapi import host
@@ -552,8 +552,9 @@ class VMwareAPISession(object):
The task is polled until it completes.
"""
done = event.Event()
- loop = utils.FixedIntervalLoopingCall(self._poll_task, instance_uuid,
- task_ref, done)
+ loop = loopingcall.FixedIntervalLoopingCall(self._poll_task,
+ instance_uuid,
+ task_ref, done)
loop.start(CONF.vmwareapi_task_poll_interval)
ret_val = done.wait()
loop.stop()
diff --git a/openstack-common.conf b/openstack-common.conf
index 31a6ce4ff..2949321d5 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -15,6 +15,7 @@ module=jsonutils
module=local
module=lockutils
module=log
+module=loopingcall
module=network_utils
module=notifier
module=plugin